arm: dts: k3-am65: Move pinctrl nodes out of U-Boot specific dtsi

Only U-Boot specifc DT properties or overrides, must be in -u-boot.dtsi.
Pinctrl nodes does not belong here. Now that pinctrl nodes are in kernel
DT, there is no reason to be keep these in -u-boot.dtsi. Move them to
proper places so that it would ease copying DT entries from kernel DT.

Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

diff --git a/arch/arm/dts/k3-am65-main.dtsi b/arch/arm/dts/k3-am65-main.dtsi
index 84fed12fbdd83107319c2eaf11def1ae12b83b94..a97872f62ec67aaf5c07a4c1adde52491a1e956f 100644 (file)
--- a/arch/arm/dts/k3-am65-main.dtsi
+++ b/arch/arm/dts/k3-am65-main.dtsi
@@ -78,6 +78,14 @@
                pinctrl-single,function-mask = <0xffffffff>;
        };
 
+       main_pmx1: pinmux@11c2e8 {
+               compatible = "pinctrl-single";
+               reg = <0x0 0x11c2e8 0x0 0x24>;
+               #pinctrl-cells = <1>;
+               pinctrl-single,register-width = <32>;
+               pinctrl-single,function-mask = <0xffffffff>;
+       };
+
        sdhci0: sdhci@4f80000 {
                compatible = "ti,am654-sdhci-5.1";
                reg = <0x0 0x4f80000 0x0 0x260>, <0x0 0x4f90000 0x0 0x134>;

diff --git a/arch/arm/dts/k3-am65-wakeup.dtsi b/arch/arm/dts/k3-am65-wakeup.dtsi
index 1f591ef8bb9e0e9a95a43e1380dd21c1e6f6e217..1b67747dfef8edcc12582b8373e3c0354181404c 100644 (file)
--- a/arch/arm/dts/k3-am65-wakeup.dtsi
+++ b/arch/arm/dts/k3-am65-wakeup.dtsi
@@ -34,6 +34,14 @@
                };
        };
 
+       wkup_pmx0: pinmux@4301c000 {
+               compatible = "pinctrl-single";
+               reg = <0x4301c000 0x118>;
+               #pinctrl-cells = <1>;
+               pinctrl-single,register-width = <32>;
+               pinctrl-single,function-mask = <0xffffffff>;
+       };
+
        wkup_uart0: serial@42300000 {
                compatible = "ti,am654-uart";
                reg = <0x42300000 0x100>;

diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
index 71d6c319c2906847fe96d9fbc7a933968081ad64..5d9ecb669f5d26ce8ed00c593927513ee9d861c6 100644 (file)
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -21,14 +21,6 @@
 &cbass_main{
        u-boot,dm-spl;
 
-       main_pmx1: pinmux@11c2e8 {
-               compatible = "pinctrl-single";
-               reg = <0x0 0x11c2e8 0x0 0x24>;
-               #pinctrl-cells = <1>;
-               pinctrl-single,register-width = <32>;
-               pinctrl-single,function-mask = <0xffffffff>;
-       };
-
        sdhci1: sdhci@04FA0000 {
                compatible = "ti,am654-sdhci-5.1";
                reg = <0x0 0x4FA0000 0x0 0x1000>,
@@ -44,13 +36,6 @@
 
 &cbass_mcu {
        u-boot,dm-spl;
-       wkup_pmx0: pinmux@4301c000 {
-               compatible = "pinctrl-single";
-               reg = <0x0 0x4301c000 0x0 0x118>;
-               #pinctrl-cells = <1>;
-               pinctrl-single,register-width = <32>;
-               pinctrl-single,function-mask = <0xffffffff>;
-       };
 
        navss_mcu: navss-mcu {
                compatible = "simple-bus";