[net-next,2/2] dt-bindings: net: qcom,ipa: restate a requirement

Message ID 20221110195619.1276302-3-elder@linaro.org
State New
Headers
Series dt-bindings: net: qcom,ipa: relax some restrictions |

Commit Message

Alex Elder Nov. 10, 2022, 7:56 p.m. UTC
  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>
---
 Documentation/devicetree/bindings/net/qcom,ipa.yaml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
  

Comments

Krzysztof Kozlowski Nov. 11, 2022, 8:30 a.m. UTC | #1
On 10/11/2022 20:56, Alex Elder wrote:
> 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>
> ---
>  Documentation/devicetree/bindings/net/qcom,ipa.yaml | 13 ++++++++-----


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof
  

Patch

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