Skip to content

Commit

Permalink
dt-bindings: net: qcom,ipa: restate a requirement
Browse files Browse the repository at this point in the history
Either the AP or modem loads GSI firmware.  If the modem-init
property is present, the modem loads it.  Otherwise, the AP loads
it, and in that case the memory-region property must be defined.

Currently this requirement is expressed as one or the other of the
modem-init or the memory-region property being required.  But it's
harmless for the memory-region to be present if the modem is loading
firmware (it'll just be ignored).

Restate the requirement so that the memory-region property is
required only if modem-init is not present.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Alex Elder authored and Jakub Kicinski committed Nov 12, 2022
1 parent 9d26628 commit 7a6ca44
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions Documentation/devicetree/bindings/net/qcom,ipa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,15 @@ required:
- interconnects
- qcom,smem-states

# Either modem-init is present, or memory-region must be present.
oneOf:
- required:
# If modem-init is not present, the AP loads GSI firmware, and
# memory-region must be specified
if:
not:
required:
- modem-init
- required:
- memory-region
then:
required:
- memory-region

additionalProperties: false

Expand Down

0 comments on commit 7a6ca44

Please sign in to comment.