Skip to content

Commit

Permalink
Merge branch 'dt-bindings-net-qcom-ipa-relax-some-restrictions'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jakub Kicinski committed Nov 12, 2022
2 parents 45f22f2 + 7a6ca44 commit d77be49
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions Documentation/devicetree/bindings/net/qcom,ipa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d77be49

Please sign in to comment.