ARM: dts: uses handles to reference nodes for changes

Use the handles for subsequent changes to nodes, similar to like the rk3288
submission does it.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 6131675695ebcdaa6258ec33dc11d26bec40c71e..38910f6992bff3166044b29b0b30a1f8e02ee044 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -24,24 +24,6 @@
                reg = <0x60000000 0x40000000>;
        };
 
-       uart0: serial@10124000 {
-               status = "okay";
-       };
-
-       uart1: serial@10126000 {
-               status = "okay";
-       };
-
-       uart2: serial@20064000 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&uart2_xfer>;
-               status = "okay";
-       };
-
-       uart3: serial@20068000 {
-               status = "okay";
-       };
-
        vcc_sd0: fixed-regulator {
                compatible = "regulator-fixed";
                regulator-name = "sdmmc-supply";
@@ -51,36 +33,6 @@
                startup-delay-us = <100000>;
        };
 
-       dwmmc@10214000 { /* sdmmc */
-               num-slots = <1>;
-               status = "okay";
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
-               vmmc-supply = <&vcc_sd0>;
-
-               slot@0 {
-                       reg = <0>;
-                       bus-width = <4>;
-                       disable-wp;
-               };
-       };
-
-       dwmmc@10218000 { /* wifi */
-               num-slots = <1>;
-               status = "okay";
-               non-removable;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
-
-               slot@0 {
-                       reg = <0>;
-                       bus-width = <4>;
-                       disable-wp;
-               };
-       };
-
        gpio-keys {
                compatible = "gpio-keys";
                #address-cells = <1>;
@@ -106,3 +58,46 @@
                /* VOL+ comes somehow thru the ADC */
        };
 };
+
+&mmc0 { /* sdmmc */
+       num-slots = <1>;
+       status = "okay";
+       vmmc-supply = <&vcc_sd0>;
+
+       slot@0 {
+               reg = <0>;
+               bus-width = <4>;
+               disable-wp;
+       };
+};
+
+&mmc1 { /* wifi */
+       num-slots = <1>;
+       status = "okay";
+       non-removable;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
+
+       slot@0 {
+               reg = <0>;
+               bus-width = <4>;
+               disable-wp;
+       };
+};
+
+&uart0 {
+       status = "okay";
+};
+
+&uart1 {
+       status = "okay";
+};
+
+&uart2 {
+       status = "okay";
+};
+
+&uart3 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index ecf722ea5982abc24faee8eef5b1e03230d84f50..460932b2baa80bbb2c84a3a7d9e07398ddd91736 100644 (file)
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -291,3 +291,33 @@
                };
        };
 };
+
+&mmc0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
+};
+
+&mmc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;
+};
+
+&uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart0_xfer>;
+};
+
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart1_xfer>;
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart2_xfer>;
+};
+
+&uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart3_xfer>;
+};

diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 7a002f523ec44d361d5874acc677424d0d44ac84..241e2a4d4b99ec1f992fa41e23d074c9d7523b9f 100644 (file)
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -23,24 +23,6 @@
                reg = <0x60000000 0x80000000>;
        };
 
-       uart0: serial@10124000 {
-               status = "okay";
-       };
-
-       uart1: serial@10126000 {
-               status = "okay";
-       };
-
-       uart2: serial@20064000 {
-               pinctrl-names = "default";
-               pinctrl-0 = <&uart2_xfer>;
-               status = "okay";
-       };
-
-       uart3: serial@20068000 {
-               status = "okay";
-       };
-
        gpio-keys {
                compatible = "gpio-keys";
                #address-cells = <1>;
@@ -76,3 +58,21 @@
                };
        };
 };
+
+&uart0 {
+       status = "okay";
+};
+
+&uart1 {
+       status = "okay";
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart2_xfer>;
+       status = "okay";
+};
+
+&uart3 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 7b631ec3102cc3194b2cffdd6250de580ab12c41..4a9f7020c5623a92dfd8fed447afc426c14d47a1 100644 (file)
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -52,14 +52,6 @@
                };
        };
 
-       global-timer@1013c200 {
-               interrupts = <GIC_PPI 11 0xf04>;
-       };
-
-       local-timer@1013c600 {
-               interrupts = <GIC_PPI 13 0xf04>;
-       };
-
        sram: sram@10080000 {
                compatible = "mmio-sram";
                reg = <0x10080000 0x8000>;
@@ -271,3 +263,31 @@
                };
        };
 };
+
+&global_timer {
+       interrupts = <GIC_PPI 11 0xf04>;
+};
+
+&local_timer {
+       interrupts = <GIC_PPI 13 0xf04>;
+};
+
+&uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart0_xfer>;
+};
+
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart1_xfer>;
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart2_xfer>;
+};
+
+&uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart3_xfer>;
+};