| Message ID | 20201010224121.12672-17-Sergey.Semin@baikalelectronics.ru (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dt-bindings: usb: Add generic USB HCD, xHCI, DWC USB3 DT schema | expand |
On 11/10/2020 00:41, Serge Semin wrote: > Amlogic G12A USB DT sub-nodes are supposed to be compatible with the > generic DWC USB2 and USB3 devices. Since now we've got DT schemas for > both of the later IP cores let's make sure that the Amlogic G12A USB > DT nodes are fully evaluated including the DWC sub-nodes. > > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > --- > .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > index 88184d7e26cc..3e8ac0ff90de 100644 > --- a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > +++ b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > @@ -78,7 +78,20 @@ properties: > > patternProperties: > "^usb@[0-9a-f]+$": > - type: object > + allOf: > + - if: > + properties: > + compatible: > + contains: > + const: snps,dwc2 > + then: > + $ref: dwc2.yaml# > + - if: > + properties: > + compatible: > + const: snps,dwc3 > + then: > + $ref: snps,dwc3.yaml# > > additionalProperties: false > > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
On Sun, Oct 11, 2020 at 01:41:19AM +0300, Serge Semin wrote: > Amlogic G12A USB DT sub-nodes are supposed to be compatible with the > generic DWC USB2 and USB3 devices. Since now we've got DT schemas for > both of the later IP cores let's make sure that the Amlogic G12A USB > DT nodes are fully evaluated including the DWC sub-nodes. > > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > --- > .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > index 88184d7e26cc..3e8ac0ff90de 100644 > --- a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > +++ b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > @@ -78,7 +78,20 @@ properties: > > patternProperties: > "^usb@[0-9a-f]+$": > - type: object > + allOf: > + - if: > + properties: > + compatible: > + contains: > + const: snps,dwc2 > + then: > + $ref: dwc2.yaml# > + - if: > + properties: > + compatible: > + const: snps,dwc3 > + then: > + $ref: snps,dwc3.yaml# It should be enough to do just: oneOf: - $ref: dwc2.yaml# - $ref: snps,dwc3.yaml#
On Tue, Oct 13, 2020 at 07:42:03AM -0500, Rob Herring wrote: > On Sun, Oct 11, 2020 at 01:41:19AM +0300, Serge Semin wrote: > > Amlogic G12A USB DT sub-nodes are supposed to be compatible with the > > generic DWC USB2 and USB3 devices. Since now we've got DT schemas for > > both of the later IP cores let's make sure that the Amlogic G12A USB > > DT nodes are fully evaluated including the DWC sub-nodes. > > > > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > > --- > > .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 15 ++++++++++++++- > > 1 file changed, 14 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > > index 88184d7e26cc..3e8ac0ff90de 100644 > > --- a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > > +++ b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml > > @@ -78,7 +78,20 @@ properties: > > > > patternProperties: > > "^usb@[0-9a-f]+$": > > - type: object > > + allOf: > > + - if: > > + properties: > > + compatible: > > + contains: > > + const: snps,dwc2 > > + then: > > + $ref: dwc2.yaml# > > + - if: > > + properties: > > + compatible: > > + const: snps,dwc3 > > + then: > > + $ref: snps,dwc3.yaml# > > It should be enough to do just: > > oneOf: > - $ref: dwc2.yaml# > - $ref: snps,dwc3.yaml# Ah, good point! Thanks. -Sergey
diff --git a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml index 88184d7e26cc..3e8ac0ff90de 100644 --- a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml +++ b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml @@ -78,7 +78,20 @@ properties: patternProperties: "^usb@[0-9a-f]+$": - type: object + allOf: + - if: + properties: + compatible: + contains: + const: snps,dwc2 + then: + $ref: dwc2.yaml# + - if: + properties: + compatible: + const: snps,dwc3 + then: + $ref: snps,dwc3.yaml# additionalProperties: false
Amlogic G12A USB DT sub-nodes are supposed to be compatible with the generic DWC USB2 and USB3 devices. Since now we've got DT schemas for both of the later IP cores let's make sure that the Amlogic G12A USB DT nodes are fully evaluated including the DWC sub-nodes. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> --- .../bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)