Untangle the bit messy oneOf trees and add the missing pinctrl-2 mention to handle the different pinctrl combinations.
Fixes: 4c8375d35f72 ("dt-bindings: usb: ci-hdrc-usb2: convert to DT schema format") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org --- .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml index 782402800d4a..24431a7adf3e 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.yaml @@ -199,17 +199,6 @@ properties: In case of HSIC-mode, "idle" and "active" pin modes are mandatory. In this case, the "idle" state needs to pull down the data and strobe pin and the "active" state needs to pull up the strobe pin. - oneOf: - - items: - - const: idle - - const: active - - items: - - const: default - - enum: - - host - - device - - items: - - const: default
pinctrl-0: maxItems: 1 @@ -357,17 +346,15 @@ allOf: - const: active else: properties: + pinctrl-2: + maxItems: 1 + pinctrl-names: minItems: 1 - maxItems: 2 - oneOf: - - items: - - const: default - - enum: - - host - - device - - items: - - const: default + items: + - const: default + - const: host + - const: device - if: properties: compatible: