ARM: dts: Use labels for overriding nodes in exynos542x

Usage of labels instead of full paths reduces possible mistakes when
overriding nodes. Additionally remove duplicated serial and uart labels
for serial.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 146e71118a72b4eef98faf47f644c0216bbb5894..8f4d76c5e11c5821ef7e504f21aa87c6103c92de 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -1027,7 +1027,7 @@
        };
 };
 
-&uart_3 {
+&serial_3 {
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 2142b6cfa16f5d75a15ef77c50c34d99ffffc1d5..95615dae0a35659cd742f62465c4782eb926f466 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -323,13 +323,6 @@
                interrupts = <0 47 0>;
        };
 
-       rtc: rtc@101E0000 {
-               clocks = <&clock CLK_RTC>;
-               clock-names = "rtc";
-               interrupt-parent = <&pmu_system_controller>;
-               status = "disabled";
-       };
-
        amba {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -500,26 +493,6 @@
                status = "disabled";
        };
 
-       uart_0: serial@12C00000 {
-               clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
-               clock-names = "uart", "clk_uart_baud0";
-       };
-
-       uart_1: serial@12C10000 {
-               clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
-               clock-names = "uart", "clk_uart_baud0";
-       };
-
-       uart_2: serial@12C20000 {
-               clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
-               clock-names = "uart", "clk_uart_baud0";
-       };
-
-       uart_3: serial@12C30000 {
-               clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
-               clock-names = "uart", "clk_uart_baud0";
-       };
-
        pwm: pwm@12dd0000 {
                compatible = "samsung,exynos4210-pwm";
                reg = <0x12dd0000 0x100>;
@@ -535,14 +508,6 @@
                #phy-cells = <0>;
        };
 
-       dp: dp-controller@145B0000 {
-               clocks = <&clock CLK_DP1>;
-               clock-names = "dp";
-               phys = <&dp_phy>;
-               phy-names = "dp";
-               power-domains = <&disp_pd>;
-       };
-
        mipi_phy: video-phy@10040714 {
                compatible = "samsung,s5pv210-mipi-video-phy";
                syscon = <&pmu_system_controller>;
@@ -562,12 +527,6 @@
                status = "disabled";
        };
 
-       fimd: fimd@14400000 {
-               clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
-               clock-names = "sclk_fimd", "fimd";
-               power-domains = <&disp_pd>;
-       };
-
        adc: adc@12D10000 {
                compatible = "samsung,exynos-adc-v2";
                reg = <0x12D10000 0x100>;
@@ -967,3 +926,44 @@
                samsung,pmureg-phandle = <&pmu_system_controller>;
        };
 };
+
+&dp {
+       clocks = <&clock CLK_DP1>;
+       clock-names = "dp";
+       phys = <&dp_phy>;
+       phy-names = "dp";
+       power-domains = <&disp_pd>;
+};
+
+&fimd {
+       clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
+       clock-names = "sclk_fimd", "fimd";
+       power-domains = <&disp_pd>;
+};
+
+&rtc {
+       clocks = <&clock CLK_RTC>;
+       clock-names = "rtc";
+       interrupt-parent = <&pmu_system_controller>;
+       status = "disabled";
+};
+
+&serial_0 {
+       clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
+       clock-names = "uart", "clk_uart_baud0";
+};
+
+&serial_1 {
+       clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
+       clock-names = "uart", "clk_uart_baud0";
+};
+
+&serial_2 {
+       clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
+       clock-names = "uart", "clk_uart_baud0";
+};
+
+&serial_3 {
+       clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
+       clock-names = "uart", "clk_uart_baud0";
+};

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 02eb8b15374f3c84ef4b215f4d7da85d2e9f342a..7d5b386b5ae6aeb32aed5baf55a2d50ddf374b39 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -990,7 +990,7 @@
        };
 };
 
-&uart_3 {
+&serial_3 {
        status = "okay";
 };