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 <[email protected]>
---
 arch/arm/boot/dts/exynos4210-i9100.dts    |  6 +++---
 arch/arm/boot/dts/exynos4210-origen.dts   |  4 ++--
 arch/arm/boot/dts/exynos4210-smdkv310.dts | 22 +++++++++++-----------
 arch/arm/boot/dts/exynos4210-trats.dts    |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts 
b/arch/arm/boot/dts/exynos4210-i9100.dts
index 5370ee477186..a0c3bab382ae 100644
--- a/arch/arm/boot/dts/exynos4210-i9100.dts
+++ b/arch/arm/boot/dts/exynos4210-i9100.dts
@@ -329,7 +329,7 @@ &i2c_3 {
        pinctrl-0 = <&i2c3_bus>;
        pinctrl-names = "default";
 
-       mxt224-touchscreen@4a {
+       touchscreen@4a {
                compatible = "atmel,maxtouch";
                reg = <0x4a>;
 
@@ -348,7 +348,7 @@ &i2c_5 {
        pinctrl-0 = <&i2c5_bus>;
        pinctrl-names = "default";
 
-       max8997_pmic@66 {
+       pmic@66 {
                compatible = "maxim,max8997-pmic";
                reg = <0x66>;
 
@@ -597,7 +597,7 @@ &i2c_7 {
        pinctrl-0 = <&i2c7_bus>;
        pinctrl-names = "default";
 
-       ak8975@c {
+       magnetometer@c {
                compatible = "asahi-kasei,ak8975";
                reg = <0x0c>;
 
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts 
b/arch/arm/boot/dts/exynos4210-origen.dts
index 7d2cfbafefb2..1c5394152561 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -43,7 +43,7 @@ mmc_reg: voltage-regulator {
                enable-active-high;
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
 
                up {
@@ -171,7 +171,7 @@ &i2c_0 {
        pinctrl-0 = <&i2c0_bus>;
        pinctrl-names = "default";
 
-       max8997_pmic@66 {
+       pmic@66 {
                compatible = "maxim,max8997-pmic";
                reg = <0x66>;
                interrupt-parent = <&gpx0>;
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts 
b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index c5609afa6101..d5797a67bf48 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -90,61 +90,61 @@ &keypad {
        pinctrl-0 = <&keypad_rows &keypad_cols>;
        status = "okay";
 
-       key_1 {
+       key-1 {
                keypad,row = <0>;
                keypad,column = <3>;
                linux,code = <2>;
        };
 
-       key_2 {
+       key-2 {
                keypad,row = <0>;
                keypad,column = <4>;
                linux,code = <3>;
        };
 
-       key_3 {
+       key-3 {
                keypad,row = <0>;
                keypad,column = <5>;
                linux,code = <4>;
        };
 
-       key_4 {
+       key-4 {
                keypad,row = <0>;
                keypad,column = <6>;
                linux,code = <5>;
        };
 
-       key_5 {
+       key-5 {
                keypad,row = <0>;
                keypad,column = <7>;
                linux,code = <6>;
        };
 
-       key_a {
+       key-a {
                keypad,row = <1>;
                keypad,column = <3>;
                linux,code = <30>;
        };
 
-       key_b {
+       key-b {
                keypad,row = <1>;
                keypad,column = <4>;
                linux,code = <48>;
        };
 
-       key_c {
+       key-c {
                keypad,row = <1>;
                keypad,column = <5>;
                linux,code = <46>;
        };
 
-       key_d {
+       key-d {
                keypad,row = <1>;
                keypad,column = <6>;
                linux,code = <32>;
        };
 
-       key_e {
+       key-e {
                keypad,row = <1>;
                keypad,column = <7>;
                linux,code = <18>;
@@ -200,7 +200,7 @@ &spi_2 {
        cs-gpios = <&gpc1 2 GPIO_ACTIVE_HIGH>;
        status = "okay";
 
-       w25x80@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "w25x80";
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts 
b/arch/arm/boot/dts/exynos4210-trats.dts
index a226bec56a45..f10c63ae9973 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -263,7 +263,7 @@ &i2c_3 {
        pinctrl-names = "default";
        status = "okay";
 
-       mms114-touchscreen@48 {
+       touchscreen@48 {
                compatible = "melfas,mms114";
                reg = <0x48>;
                interrupt-parent = <&gpx0>;
@@ -283,7 +283,7 @@ &i2c_5 {
        pinctrl-names = "default";
        status = "okay";
 
-       max8997_pmic@66 {
+       pmic@66 {
                compatible = "maxim,max8997-pmic";
 
                reg = <0x66>;
-- 
2.25.1

Reply via email to