[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20221110195619.1276302-3-elder@linaro.org>
Date: Thu, 10 Nov 2022 13:56:18 -0600
From: Alex Elder <elder@...aro.org>
To: robh+dt@...nel.org, krzysztof.kozlowski+dt@...aro.org,
davem@...emloft.net, edumazet@...gle.com, kuba@...nel.org,
pabeni@...hat.com
Cc: andersson@...nel.org, konrad.dybcio@...aro.org, agross@...nel.org,
elder@...nel.org, linux-arm-msm@...r.kernel.org,
netdev@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH net-next 2/2] dt-bindings: net: qcom,ipa: restate a requirement
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@...aro.org>
---
Documentation/devicetree/bindings/net/qcom,ipa.yaml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml
index 2d253ef488188..e752b76192df0 100644
--- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml
+++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml
@@ -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
--
2.34.1
Powered by blists - more mailing lists