| Message ID | 20210622142436.4014610-1-thierry.reding@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] dt-bindings: clock: tegra: Fix USB controller nodes in examples | expand |
On Tue, Jun 22, 2021 at 04:24:35PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > A subsequent patch will convert the USB controller device tree bindings > to json-schema, which will cause the DT validation to point out various > issues with the examples in the clock and reset controller bindings. > > Fix these issues so that the subsequent patch will not cause validation > warnings. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > .../bindings/clock/nvidia,tegra124-car.yaml | 11 ++++++++--- > .../devicetree/bindings/clock/nvidia,tegra20-car.yaml | 5 +++++ > 2 files changed, 13 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml b/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml > index ec7ab1483652..d5a873097379 100644 > --- a/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml > +++ b/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml > @@ -99,6 +99,7 @@ additionalProperties: false > examples: > - | > #include <dt-bindings/clock/tegra124-car.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > car: clock-controller@60006000 { > compatible = "nvidia,tegra124-car"; > @@ -107,9 +108,13 @@ examples: > #reset-cells = <1>; > }; > > - usb-controller@c5004000 { > - compatible = "nvidia,tegra20-ehci"; > - reg = <0xc5004000 0x4000>; > + usb-controller@7d000000 { Since you are here, 'usb' is the documented and preferred node name. > + compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci"; > + reg = <0x7d000000 0x4000>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + phy_type = "utmi"; > clocks = <&car TEGRA124_CLK_USB2>; > resets = <&car TEGRA124_CLK_USB2>; > + reset-names = "usb"; > + nvidia,phy = <&phy1>; > }; > diff --git a/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml b/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml > index 459d2a525393..11e6d9513373 100644 > --- a/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml > +++ b/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml > @@ -53,6 +53,7 @@ additionalProperties: false > examples: > - | > #include <dt-bindings/clock/tegra20-car.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > car: clock-controller@60006000 { > compatible = "nvidia,tegra20-car"; > @@ -64,6 +65,10 @@ examples: > usb-controller@c5004000 { > compatible = "nvidia,tegra20-ehci"; > reg = <0xc5004000 0x4000>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + phy_type = "utmi"; > clocks = <&car TEGRA20_CLK_USB2>; > resets = <&car TEGRA20_CLK_USB2>; > + reset-names = "usb"; > + nvidia,phy = <&phy1>; > }; > -- > 2.32.0 > >
On Tue, Jun 22, 2021 at 04:24:36PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > Convert the old plain-text device tree bindings for the USB EHCI > controller found on NVIDIA Tegra SoCs to the json-schema format. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > Changes in v2: > - drop unneeded clock-names property > - fix indentation issues > > .../bindings/usb/nvidia,tegra20-ehci.txt | 23 --- > .../bindings/usb/nvidia,tegra20-ehci.yaml | 150 ++++++++++++++++++ > 2 files changed, 150 insertions(+), 23 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt > create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.yaml > > diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt > deleted file mode 100644 > index f60785f73d3d..000000000000 > --- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt > +++ /dev/null > @@ -1,23 +0,0 @@ > -Tegra SOC USB controllers > - > -The device node for a USB controller that is part of a Tegra > -SOC is as described in the document "Open Firmware Recommended > -Practice : Universal Serial Bus" with the following modifications > -and additions : > - > -Required properties : > - - compatible : For Tegra20, must contain "nvidia,tegra20-ehci". > - For Tegra30, must contain "nvidia,tegra30-ehci". Otherwise, must contain > - "nvidia,<chip>-ehci" plus at least one of the above, where <chip> is > - tegra114, tegra124, tegra132, or tegra210. > - - nvidia,phy : phandle of the PHY that the controller is connected to. > - - clocks : Must contain one entry, for the module clock. > - See ../clocks/clock-bindings.txt for details. > - - resets : Must contain an entry for each entry in reset-names. > - See ../reset/reset.txt for details. > - - reset-names : Must include the following entries: > - - usb > - > -Optional properties: > - - nvidia,needs-double-reset : boolean is to be set for some of the Tegra20 > - USB ports, which need reset twice due to hardware issues. > diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.yaml b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.yaml > new file mode 100644 > index 000000000000..079cae44b8d9 > --- /dev/null > +++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.yaml > @@ -0,0 +1,150 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/usb/nvidia,tegra20-ehci.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Device tree binding for NVIDIA Tegra USB controllers > + > +description: | > + The device node for a USB controller that is part of a Tegra SOC is as > + described in the document "Open Firmware Recommended Practice : Universal > + Serial Bus". Modifications and additions are detailed in this document. > + > +maintainers: > + - Thierry Reding <treding@nvidia.com> > + - Jon Hunter <jonathanh@nvidia.com> allOf: - $ref: usb-hcd.yaml# > + > +properties: > + compatible: > + oneOf: > + - items: > + - enum: > + - nvidia,tegra210-ehci > + - nvidia,tegra124-ehci > + - nvidia,tegra114-ehci > + - const: nvidia,tegra30-ehci > + - items: > + - const: nvidia,tegra30-ehci > + - items: > + - const: nvidia,tegra20-ehci > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + phy_type: > + $ref: /schemas/types.yaml#/definitions/string Already has a type (usb.yaml). You support all the possible modes? If not, list what is supported. > + > + clocks: > + maxItems: 1 > + > + resets: > + maxItems: 1 > + > + reset-names: > + items: > + - const: usb > + > + nvidia,phy: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + phandle of the PHY that the controller is connected to > + > + nvidia,needs-double-reset: > + type: boolean > + description: > + This must be set for some instances of the USB controller found on > + Tegra20 that need to be reset twice due to some hardware issue. > + > +additionalProperties: false > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + - resets > + - reset-names > + - phy_type > + - nvidia,phy > + > +examples: > + - | > + #include <dt-bindings/clock/tegra20-car.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + usb@c5000000 { > + compatible = "nvidia,tegra20-ehci"; > + reg = <0xc5000000 0x4000>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + phy_type = "utmi"; > + clocks = <&tegra_car TEGRA20_CLK_USBD>; > + resets = <&tegra_car 22>; > + reset-names = "usb"; > + nvidia,needs-double-reset; > + nvidia,phy = <&phy1>; > + }; > + > + - | > + #include <dt-bindings/clock/tegra30-car.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + usb@7d000000 { > + compatible = "nvidia,tegra30-ehci"; > + reg = <0x7d000000 0x4000>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + phy_type = "utmi"; > + clocks = <&tegra_car TEGRA30_CLK_USBD>; > + resets = <&tegra_car 22>; > + reset-names = "usb"; > + nvidia,needs-double-reset; > + nvidia,phy = <&phy1>; > + }; > + > + - | > + #include <dt-bindings/clock/tegra114-car.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + usb@7d000000 { > + compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci"; > + reg = <0x7d000000 0x4000>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + phy_type = "utmi"; > + clocks = <&tegra_car TEGRA114_CLK_USBD>; > + resets = <&tegra_car 22>; > + reset-names = "usb"; > + nvidia,phy = <&phy1>; > + }; > + > + - | > + #include <dt-bindings/clock/tegra124-car.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + usb@7d000000 { > + compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci"; > + reg = <0x7d000000 0x4000>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + phy_type = "utmi"; > + clocks = <&tegra_car TEGRA124_CLK_USBD>; > + resets = <&tegra_car 22>; > + reset-names = "usb"; > + nvidia,phy = <&phy1>; > + }; > + > + - | > + #include <dt-bindings/clock/tegra210-car.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + usb@7d000000 { > + compatible = "nvidia,tegra210-ehci", "nvidia,tegra30-ehci"; > + reg = <0x7d000000 0x4000>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + phy_type = "utmi"; > + clocks = <&tegra_car TEGRA210_CLK_USBD>; > + resets = <&tegra_car 22>; > + reset-names = "usb"; > + nvidia,phy = <&phy1>; > + }; > -- > 2.32.0 > >
diff --git a/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml b/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml index ec7ab1483652..d5a873097379 100644 --- a/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml +++ b/Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml @@ -99,6 +99,7 @@ additionalProperties: false examples: - | #include <dt-bindings/clock/tegra124-car.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> car: clock-controller@60006000 { compatible = "nvidia,tegra124-car"; @@ -107,9 +108,13 @@ examples: #reset-cells = <1>; }; - usb-controller@c5004000 { - compatible = "nvidia,tegra20-ehci"; - reg = <0xc5004000 0x4000>; + usb-controller@7d000000 { + compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci"; + reg = <0x7d000000 0x4000>; + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; + phy_type = "utmi"; clocks = <&car TEGRA124_CLK_USB2>; resets = <&car TEGRA124_CLK_USB2>; + reset-names = "usb"; + nvidia,phy = <&phy1>; }; diff --git a/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml b/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml index 459d2a525393..11e6d9513373 100644 --- a/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml +++ b/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml @@ -53,6 +53,7 @@ additionalProperties: false examples: - | #include <dt-bindings/clock/tegra20-car.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> car: clock-controller@60006000 { compatible = "nvidia,tegra20-car"; @@ -64,6 +65,10 @@ examples: usb-controller@c5004000 { compatible = "nvidia,tegra20-ehci"; reg = <0xc5004000 0x4000>; + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; + phy_type = "utmi"; clocks = <&car TEGRA20_CLK_USB2>; resets = <&car TEGRA20_CLK_USB2>; + reset-names = "usb"; + nvidia,phy = <&phy1>; };