From: Alex Elder Date: Thu, 10 Nov 2022 19:56:18 +0000 (-0600) Subject: dt-bindings: net: qcom,ipa: restate a requirement X-Git-Tag: v6.2-rc1~99^2~227^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7a6ca44c1e6156ac49274ce44f67bdc4d86187cb;p=tomoyo%2Ftomoyo-test1.git 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 Reviewed-by: Krzysztof Kozlowski Signed-off-by: Jakub Kicinski --- diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index 2d253ef48818..e752b76192df 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