diff mbox series

[v2,1/2] dt-bindings: clock: tegra: Fix USB controller nodes in examples

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

Commit Message

Thierry Reding June 22, 2021, 2:24 p.m. UTC
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(-)

Comments

Rob Herring July 14, 2021, 5:56 p.m. UTC | #1
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
> 
>
diff mbox series

Patch

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>;
     };