Merge branch 'for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[linux-2.6-microblaze.git] / arch / arm / boot / dts / s5pv210-goni.dts

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>;