ARM: dts: s5pv210: adjust node names to DT spec

The Devicetree specification expects device node names to have a generic
name, representing the class of a device.  Also the convention for node
names is to use hyphens, not underscores.

No functional changes.

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

diff --git a/arch/arm/boot/dts/s5pv210-aquila.dts b/arch/arm/boot/dts/s5pv210-aquila.dts
index 8e57e5a..6423348 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aquila.dts
+++ b/arch/arm/boot/dts/s5pv210-aquila.dts
@@ -277,37 +277,37 @@
                        <&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
        status = "okay";
 
-       key_1 {
+       key-1 {
                keypad,row = <0>;
                keypad,column = <1>;
                linux,code = <KEY_CONNECT>;
        };
 
-       key_2 {
+       key-2 {
                keypad,row = <0>;
                keypad,column = <2>;
                linux,code = <KEY_BACK>;
        };
 
-       key_3 {
+       key-3 {
                keypad,row = <1>;
                keypad,column = <1>;
                linux,code = <KEY_CAMERA_FOCUS>;
        };
 
-       key_4 {
+       key-4 {
                keypad,row = <1>;
                keypad,column = <2>;
                linux,code = <KEY_VOLUMEUP>;
        };
 
-       key_5 {
+       key-5 {
                keypad,row = <2>;
                keypad,column = <1>;
                linux,code = <KEY_CAMERA>;
        };
 
-       key_6 {
+       key-6 {
                keypad,row = <2>;
                keypad,column = <2>;
                linux,code = <KEY_VOLUMEDOWN>;

diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index bd4450d..91ecad8 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -54,7 +54,7 @@
                clock-frequency = <32768>;
        };
 
-       bt_codec: bt_sco {
+       bt_codec: bt-sco {
                compatible = "linux,bt-sco";
                #sound-dai-cells = <0>;
        };
@@ -113,7 +113,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&sound_i2c_pins>;
 
-               wm8994: wm8994@1a {
+               wm8994: audio-codec@1a {
                        compatible = "wlf,wm8994";
                        reg = <0x1a>;
 

diff --git a/arch/arm/boot/dts/s5pv210-goni.dts b/arch/arm/boot/dts/s5pv210-goni.dts
index ad8d5d2..5c1e12d 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-goni.dts
+++ b/arch/arm/boot/dts/s5pv210-goni.dts
@@ -259,37 +259,37 @@
                        <&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
        status = "okay";
 
-       key_1 {
+       key-1 {
                keypad,row = <0>;
                keypad,column = <1>;
                linux,code = <KEY_CONNECT>;
        };
 
-       key_2 {
+       key-2 {
                keypad,row = <0>;
                keypad,column = <2>;
                linux,code = <KEY_BACK>;
        };
 
-       key_3 {
+       key-3 {
                keypad,row = <1>;
                keypad,column = <1>;
                linux,code = <KEY_CAMERA_FOCUS>;
        };
 
-       key_4 {
+       key-4 {
                keypad,row = <1>;
                keypad,column = <2>;
                linux,code = <KEY_VOLUMEUP>;
        };
 
-       key_5 {
+       key-5 {
                keypad,row = <2>;
                keypad,column = <1>;
                linux,code = <KEY_CAMERA>;
        };
 
-       key_6 {
+       key-6 {
                keypad,row = <2>;
                keypad,column = <2>;
                linux,code = <KEY_VOLUMEDOWN>;
@@ -353,7 +353,7 @@
        samsung,i2c-slave-addr = <0x10>;
        status = "okay";
 
-       tsp@4a {
+       touchscreen@4a {
                compatible = "atmel,maxtouch";
                reg = <0x4a>;
                interrupt-parent = <&gpj0>;

diff --git a/arch/arm/boot/dts/s5pv210-smdkv210.dts b/arch/arm/boot/dts/s5pv210-smdkv210.dts
index 7459e41..fbae768 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-smdkv210.dts
+++ b/arch/arm/boot/dts/s5pv210-smdkv210.dts
@@ -76,61 +76,61 @@
                        <&keypad_col6>, <&keypad_col7>;
        status = "okay";
 
-       key_1 {
+       key-1 {
                keypad,row = <0>;
                keypad,column = <3>;
                linux,code = <KEY_1>;
        };
 
-       key_2 {
+       key-2 {
                keypad,row = <0>;
                keypad,column = <4>;
                linux,code = <KEY_2>;
        };
 
-       key_3 {
+       key-3 {
                keypad,row = <0>;
                keypad,column = <5>;
                linux,code = <KEY_3>;
        };
 
-       key_4 {
+       key-4 {
                keypad,row = <0>;
                keypad,column = <6>;
                linux,code = <KEY_4>;
        };
 
-       key_5 {
+       key-5 {
                keypad,row = <0
                >;
                keypad,column = <7>;
                linux,code = <KEY_5>;
        };
 
-       key_6 {
+       key-6 {
                keypad,row = <1>;
                keypad,column = <3>;
                linux,code = <KEY_A>;
        };
-       key_7 {
+       key-7 {
                keypad,row = <1>;
                keypad,column = <4>;
                linux,code = <KEY_B>;
        };
 
-       key_8 {
+       key-8 {
                keypad,row = <1>;
                keypad,column = <5>;
                linux,code = <KEY_C>;
        };
 
-       key_9 {
+       key-9 {
                keypad,row = <1>;
                keypad,column = <6>;
                linux,code = <KEY_D>;
        };
 
-       key_10 {
+       key-10 {
                keypad,row = <1>;
                keypad,column = <7>;
                linux,code = <KEY_E>;