arm64: tegra: Restructure Tegra210 PMC pinmux nodes

The PMC pinmux configuration nodes need to be part of a top-level pinmux
node. Add that new "pinmux" node and move the configuration nodes into
it.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
index 046ce8e..e2d8433 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi
@@ -911,35 +911,33 @@
                        };
                };
 
-               sdmmc1_3v3: sdmmc1-3v3 {
-                       pins = "sdmmc1";
-                       power-source = <TEGRA_IO_PAD_VOLTAGE_3V3>;
-               };
+               pinmux {
+                       sdmmc1_3v3: sdmmc1-3v3 {
+                               pins = "sdmmc1";
+                               power-source = <TEGRA_IO_PAD_VOLTAGE_3V3>;
+                       };
 
-               sdmmc1_1v8: sdmmc1-1v8 {
-                       pins = "sdmmc1";
-                       power-source = <TEGRA_IO_PAD_VOLTAGE_1V8>;
-               };
+                       sdmmc1_1v8: sdmmc1-1v8 {
+                               pins = "sdmmc1";
+                               power-source = <TEGRA_IO_PAD_VOLTAGE_1V8>;
+                       };
 
-               sdmmc3_3v3: sdmmc3-3v3 {
-                       pins = "sdmmc3";
-                       power-source = <TEGRA_IO_PAD_VOLTAGE_3V3>;
-               };
+                       sdmmc3_3v3: sdmmc3-3v3 {
+                               pins = "sdmmc3";
+                               power-source = <TEGRA_IO_PAD_VOLTAGE_3V3>;
+                       };
 
-               sdmmc3_1v8: sdmmc3-1v8 {
-                       pins = "sdmmc3";
-                       power-source = <TEGRA_IO_PAD_VOLTAGE_1V8>;
-               };
+                       sdmmc3_1v8: sdmmc3-1v8 {
+                               pins = "sdmmc3";
+                               power-source = <TEGRA_IO_PAD_VOLTAGE_1V8>;
+                       };
 
-               pex_dpd_disable: pex_en {
-                       pex-dpd-disable {
+                       pex_dpd_disable: pex-dpd-disable {
                                pins = "pex-bias", "pex-clk1", "pex-clk2";
                                low-power-disable;
                        };
-               };
 
-               pex_dpd_enable: pex_dis {
-                       pex-dpd-enable {
+                       pex_dpd_enable: pex-dpd-enable {
                                pins = "pex-bias", "pex-clk1", "pex-clk2";
                                low-power-enable;
                        };