| Message ID | 20200616135238.3001888-3-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: tegra: Various fixes for DT schema validation | expand |
On 16/06/2020 14:51, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > The standard way to do this is to list out the clocks at the top-level. > Adopt the standard way to fix validation. > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > arch/arm/boot/dts/tegra114-dalmore.dts | 15 ++++----------- > arch/arm/boot/dts/tegra114-roth.dts | 15 ++++----------- > arch/arm/boot/dts/tegra114-tn7.dts | 15 ++++----------- > arch/arm/boot/dts/tegra124-jetson-tk1.dts | 15 ++++----------- > arch/arm/boot/dts/tegra124-nyan.dtsi | 15 ++++----------- > arch/arm/boot/dts/tegra124-venice2.dts | 15 ++++----------- > arch/arm/boot/dts/tegra20-harmony.dts | 15 ++++----------- > arch/arm/boot/dts/tegra20-paz00.dts | 15 ++++----------- > arch/arm/boot/dts/tegra20-seaboard.dts | 15 ++++----------- > arch/arm/boot/dts/tegra20-trimslice.dts | 19 ++++++------------- > arch/arm/boot/dts/tegra20-ventana.dts | 15 ++++----------- > arch/arm/boot/dts/tegra30-beaver.dts | 15 ++++----------- > arch/arm/boot/dts/tegra30-cardhu.dtsi | 15 ++++----------- > 13 files changed, 54 insertions(+), 145 deletions(-) ... > diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts > index 8debd3d3c20d..5b26482a55b7 100644 > --- a/arch/arm/boot/dts/tegra20-trimslice.dts > +++ b/arch/arm/boot/dts/tegra20-trimslice.dts > @@ -366,30 +366,23 @@ usb-phy@c5008000 { > status = "okay"; > }; > > - sdhci@c8000000 { > + mmc@c8000000 { > status = "okay"; > broken-cd; > bus-width = <4>; > }; > > - sdhci@c8000600 { > + mmc@c8000600 { > status = "okay"; > cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>; > wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>; > bus-width = <4>; > }; I think that the above belongs in patch 13/73. Jon
On Tue, Jun 16, 2020 at 08:06:56PM +0100, Jon Hunter wrote: > > > On 16/06/2020 14:51, Thierry Reding wrote: > > From: Thierry Reding <treding@nvidia.com> > > > > The standard way to do this is to list out the clocks at the top-level. > > Adopt the standard way to fix validation. > > > > Signed-off-by: Thierry Reding <treding@nvidia.com> > > --- > > arch/arm/boot/dts/tegra114-dalmore.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra114-roth.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra114-tn7.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra124-jetson-tk1.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra124-nyan.dtsi | 15 ++++----------- > > arch/arm/boot/dts/tegra124-venice2.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra20-harmony.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra20-paz00.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra20-seaboard.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra20-trimslice.dts | 19 ++++++------------- > > arch/arm/boot/dts/tegra20-ventana.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra30-beaver.dts | 15 ++++----------- > > arch/arm/boot/dts/tegra30-cardhu.dtsi | 15 ++++----------- > > 13 files changed, 54 insertions(+), 145 deletions(-) > > ... > > > diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts > > index 8debd3d3c20d..5b26482a55b7 100644 > > --- a/arch/arm/boot/dts/tegra20-trimslice.dts > > +++ b/arch/arm/boot/dts/tegra20-trimslice.dts > > @@ -366,30 +366,23 @@ usb-phy@c5008000 { > > status = "okay"; > > }; > > > > - sdhci@c8000000 { > > + mmc@c8000000 { > > status = "okay"; > > broken-cd; > > bus-width = <4>; > > }; > > > > - sdhci@c8000600 { > > + mmc@c8000600 { > > status = "okay"; > > cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>; > > wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>; > > bus-width = <4>; > > }; > > I think that the above belongs in patch 13/73. Good catch! Thierry
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index 08be733ee2cd..04adfcb30cd7 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -1152,17 +1152,10 @@ backlight: backlight { default-brightness-level = <6>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts index 3d3835591cd2..73b83d51b59b 100644 --- a/arch/arm/boot/dts/tegra114-roth.dts +++ b/arch/arm/boot/dts/tegra114-roth.dts @@ -1016,17 +1016,10 @@ backlight: backlight { enable-gpios = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts index bfdd1bf61816..94e801b7986e 100644 --- a/arch/arm/boot/dts/tegra114-tn7.dts +++ b/arch/arm/boot/dts/tegra114-tn7.dts @@ -273,17 +273,10 @@ backlight: backlight { power-supply = <&lcd_bl_en>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts index 3bce7a1b288a..51b217a6507d 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -1855,17 +1855,10 @@ usb-phy@7d008000 { vbus-supply = <&vdd_usb3_vbus>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; cpus { diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi index 9cb5921bb1fa..4555d01094b5 100644 --- a/arch/arm/boot/dts/tegra124-nyan.dtsi +++ b/arch/arm/boot/dts/tegra124-nyan.dtsi @@ -575,17 +575,10 @@ backlight: backlight { 256>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; cpus { diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts index 710a68c5d4c7..6a7a31c831c5 100644 --- a/arch/arm/boot/dts/tegra124-venice2.dts +++ b/arch/arm/boot/dts/tegra124-venice2.dts @@ -1057,17 +1057,10 @@ backlight: backlight { default-brightness-level = <6>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts index 02cd67ea2503..bdfbe26fa26a 100644 --- a/arch/arm/boot/dts/tegra20-harmony.dts +++ b/arch/arm/boot/dts/tegra20-harmony.dts @@ -640,17 +640,10 @@ backlight: backlight { default-brightness-level = <6>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts index cce3a3fb82ed..bfc9625a6c72 100644 --- a/arch/arm/boot/dts/tegra20-paz00.dts +++ b/arch/arm/boot/dts/tegra20-paz00.dts @@ -569,17 +569,10 @@ backlight: backlight { backlight-boot-off; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts index 376ecb6435f4..28dcff3b7d7e 100644 --- a/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/arch/arm/boot/dts/tegra20-seaboard.dts @@ -792,17 +792,10 @@ backlight: backlight { default-brightness-level = <6>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts index 8debd3d3c20d..5b26482a55b7 100644 --- a/arch/arm/boot/dts/tegra20-trimslice.dts +++ b/arch/arm/boot/dts/tegra20-trimslice.dts @@ -366,30 +366,23 @@ usb-phy@c5008000 { status = "okay"; }; - sdhci@c8000000 { + mmc@c8000000 { status = "okay"; broken-cd; bus-width = <4>; }; - sdhci@c8000600 { + mmc@c8000600 { status = "okay"; cd-gpios = <&gpio TEGRA_GPIO(P, 1) GPIO_ACTIVE_LOW>; wp-gpios = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>; bus-width = <4>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts index 022649119821..59998d3708a1 100644 --- a/arch/arm/boot/dts/tegra20-ventana.dts +++ b/arch/arm/boot/dts/tegra20-ventana.dts @@ -586,17 +586,10 @@ backlight: backlight { default-brightness-level = <6>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-keys { diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts index 6b6fd8a8058f..ef3ea08f8d19 100644 --- a/arch/arm/boot/dts/tegra30-beaver.dts +++ b/arch/arm/boot/dts/tegra30-beaver.dts @@ -1965,17 +1965,10 @@ usb-phy@7d008000 { status = "okay"; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; gpio-leds { diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi index 5ee5d141bd81..c166967b6c3f 100644 --- a/arch/arm/boot/dts/tegra30-cardhu.dtsi +++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi @@ -418,17 +418,10 @@ backlight: backlight { default-brightness-level = <6>; }; - clocks { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - clk32k_in: clock@0 { - compatible = "fixed-clock"; - reg = <0>; - #clock-cells = <0>; - clock-frequency = <32768>; - }; + clk32k_in: clock@0 { + compatible = "fixed-clock"; + clock-frequency = <32768>; + #clock-cells = <0>; }; panel: panel {