Merge branch 'dt-bindings-net-qcom-ipa-relax-some-restrictions'
Alex Elder says: ==================== dt-bindings: net: qcom,ipa: relax some restrictions The first patch in this series simply removes an unnecessary requirement in the IPA binding. Previously, if the modem was doing GSI firmware loading, the firmware name property was required to *not* be present. There is no harm in having the firmware name be specified, so this restriction isn't needed. The second patch restates a requirement on the "memory-region" property more accurately. These binding changes have no impact on existing code or DTS files. These aren't really bug fixes, so no need to back-port. ==================== Link: https://lore.kernel.org/r/20221110195619.1276302-1-elder@linaro.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
commit
d77be49309
|
@ -155,22 +155,15 @@ required:
|
|||
- interconnects
|
||||
- qcom,smem-states
|
||||
|
||||
# Either modem-init is present, or memory-region must be present.
|
||||
oneOf:
|
||||
- required:
|
||||
- modem-init
|
||||
- required:
|
||||
- memory-region
|
||||
|
||||
# If memory-region is present, firmware-name may optionally be present.
|
||||
# But if modem-init is present, firmware-name must not be present.
|
||||
# If modem-init is not present, the AP loads GSI firmware, and
|
||||
# memory-region must be specified
|
||||
if:
|
||||
required:
|
||||
- modem-init
|
||||
then:
|
||||
not:
|
||||
required:
|
||||
- firmware-name
|
||||
- modem-init
|
||||
then:
|
||||
required:
|
||||
- memory-region
|
||||
|
||||
additionalProperties: false
|
||||
|
||||
|
|
Loading…
Reference in New Issue