ARM: dts: s3c24xx: override nodes by label

Using full paths to extend or override a device tree node is error
prone.  If there was a typo error, a new node will be created instead of
extending the existing node.  This will lead to run-time errors that
could be hard to detect.

A mistyped label on the other hand, will cause a dtc compile error
(during build time).

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200907183313.29234-9-krzk@kernel.org

diff --git a/arch/arm/boot/dts/s3c2416.dtsi b/arch/arm/boot/dts/s3c2416.dtsi
index 6adf64e..d1dec9f 100644 (file)
--- a/arch/arm/boot/dts/s3c2416.dtsi
+++ b/arch/arm/boot/dts/s3c2416.dtsi
@@ -23,49 +23,12 @@
                };
        };
 
-       interrupt-controller@4a000000 {
-               compatible = "samsung,s3c2416-irq";
-       };
-
        clocks: clock-controller@4c000000 {
                compatible = "samsung,s3c2416-clock";
                reg = <0x4c000000 0x40>;
                #clock-cells = <1>;
        };
 
-       pinctrl@56000000 {
-               compatible = "samsung,s3c2416-pinctrl";
-       };
-
-       timer@51000000 {
-               clocks = <&clocks PCLK_PWM>;
-               clock-names = "timers";
-       };
-
-       uart_0: serial@50000000 {
-               compatible = "samsung,s3c2440-uart";
-               clock-names = "uart", "clk_uart_baud2",
-                               "clk_uart_baud3";
-               clocks = <&clocks PCLK_UART0>, <&clocks PCLK_UART0>,
-                               <&clocks SCLK_UART>;
-       };
-
-       uart_1: serial@50004000 {
-               compatible = "samsung,s3c2440-uart";
-               clock-names = "uart", "clk_uart_baud2",
-                               "clk_uart_baud3";
-               clocks = <&clocks PCLK_UART1>, <&clocks PCLK_UART1>,
-                               <&clocks SCLK_UART>;
-       };
-
-       uart_2: serial@50008000 {
-               compatible = "samsung,s3c2440-uart";
-               clock-names = "uart", "clk_uart_baud2",
-                               "clk_uart_baud3";
-               clocks = <&clocks PCLK_UART2>, <&clocks PCLK_UART2>,
-                               <&clocks SCLK_UART>;
-       };
-
        uart_3: serial@5000c000 {
                compatible = "samsung,s3c2440-uart";
                reg = <0x5000C000 0x4000>;
@@ -98,22 +61,59 @@
                                <&clocks MUX_HSMMC1>;
                status = "disabled";
        };
+};
 
-       watchdog: watchdog@53000000 {
-               interrupts = <1 9 27 3>;
-               clocks = <&clocks PCLK_WDT>;
-               clock-names = "watchdog";
-       };
+&i2c {
+       compatible = "samsung,s3c2440-i2c";
+       clocks = <&clocks PCLK_I2C0>;
+       clock-names = "i2c";
+};
 
-       rtc: rtc@57000000 {
-               compatible = "samsung,s3c2416-rtc";
-               clocks = <&clocks PCLK_RTC>;
-               clock-names = "rtc";
-       };
+&intc {
+       compatible = "samsung,s3c2416-irq";
+};
 
-       i2c@54000000 {
-               compatible = "samsung,s3c2440-i2c";
-               clocks = <&clocks PCLK_I2C0>;
-               clock-names = "i2c";
-       };
+&pinctrl_0 {
+       compatible = "samsung,s3c2416-pinctrl";
+};
+
+&rtc {
+       compatible = "samsung,s3c2416-rtc";
+       clocks = <&clocks PCLK_RTC>;
+       clock-names = "rtc";
+};
+
+&timer {
+       clocks = <&clocks PCLK_PWM>;
+       clock-names = "timers";
+};
+
+&uart_0 {
+       compatible = "samsung,s3c2440-uart";
+       clock-names = "uart", "clk_uart_baud2",
+                       "clk_uart_baud3";
+       clocks = <&clocks PCLK_UART0>, <&clocks PCLK_UART0>,
+                       <&clocks SCLK_UART>;
+};
+
+&uart_1 {
+       compatible = "samsung,s3c2440-uart";
+       clock-names = "uart", "clk_uart_baud2",
+                       "clk_uart_baud3";
+       clocks = <&clocks PCLK_UART1>, <&clocks PCLK_UART1>,
+                       <&clocks SCLK_UART>;
+};
+
+&uart_2 {
+       compatible = "samsung,s3c2440-uart";
+       clock-names = "uart", "clk_uart_baud2",
+                       "clk_uart_baud3";
+       clocks = <&clocks PCLK_UART2>, <&clocks PCLK_UART2>,
+                       <&clocks SCLK_UART>;
+};
+
+&watchdog {
+       interrupts = <1 9 27 3>;
+       clocks = <&clocks PCLK_WDT>;
+       clock-names = "watchdog";
 };

diff --git a/arch/arm/boot/dts/s3c24xx.dtsi b/arch/arm/boot/dts/s3c24xx.dtsi
index 0d49d76..80d4ce7 100644 (file)
--- a/arch/arm/boot/dts/s3c24xx.dtsi
+++ b/arch/arm/boot/dts/s3c24xx.dtsi
@@ -13,12 +13,12 @@
 
        aliases {
                pinctrl0 = &pinctrl_0;
-               serial0 = &uart0;
-               serial1 = &uart1;
-               serial2 = &uart2;
+               serial0 = &uart_0;
+               serial1 = &uart_1;
+               serial2 = &uart_2;
        };
 
-       intc:interrupt-controller@4a000000 {
+       intc: interrupt-controller@4a000000 {
                compatible = "samsung,s3c2410-irq";
                reg = <0x4a000000 0x100>;
                interrupt-controller;
@@ -39,49 +39,49 @@
                };
        };
 
-       timer@51000000 {
+       timer: timer@51000000 {
                compatible = "samsung,s3c2410-pwm";
                reg = <0x51000000 0x1000>;
                interrupts = <0 0 10 3>, <0 0 11 3>, <0 0 12 3>, <0 0 13 3>, <0 0 14 3>;
                #pwm-cells = <3>;
        };
 
-       uart0: serial@50000000 {
+       uart_0: serial@50000000 {
                compatible = "samsung,s3c2410-uart";
                reg = <0x50000000 0x4000>;
                interrupts = <1 28 0 4>, <1 28 1 4>;
                status = "disabled";
        };
 
-       uart1: serial@50004000 {
+       uart_1: serial@50004000 {
                compatible = "samsung,s3c2410-uart";
                reg = <0x50004000 0x4000>;
                interrupts = <1 23 3 4>, <1 23 4 4>;
                status = "disabled";
        };
 
-       uart2: serial@50008000 {
+       uart_2: serial@50008000 {
                compatible = "samsung,s3c2410-uart";
                reg = <0x50008000 0x4000>;
                interrupts = <1 15 6 4>, <1 15 7 4>;
                status = "disabled";
        };
 
-       watchdog@53000000 {
+       watchdog: watchdog@53000000 {
                compatible = "samsung,s3c2410-wdt";
                reg = <0x53000000 0x100>;
                interrupts = <0 0 9 3>;
                status = "disabled";
        };
 
-       rtc@57000000 {
+       rtc: rtc@57000000 {
                compatible = "samsung,s3c2410-rtc";
                reg = <0x57000000 0x100>;
                interrupts = <0 0 30 3>, <0 0 8 3>;
                status = "disabled";
        };
 
-       i2c@54000000 {
+       i2c: i2c@54000000 {
                compatible = "samsung,s3c2410-i2c";
                reg = <0x54000000 0x100>;
                interrupts = <0 0 27 3>;