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/exynos3250-artik5.dtsi | 2 +-
 arch/arm/boot/dts/exynos3250-monk.dts    | 8 ++++----
 arch/arm/boot/dts/exynos3250-rinato.dts  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi 
b/arch/arm/boot/dts/exynos3250-artik5.dtsi
index 12887b3924af..04290ec4583a 100644
--- a/arch/arm/boot/dts/exynos3250-artik5.dtsi
+++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi
@@ -76,7 +76,7 @@ &i2c_0 {
        samsung,i2c-max-bus-freq = <100000>;
        status = "okay";
 
-       s2mps14_pmic@66 {
+       pmic@66 {
                compatible = "samsung,s2mps14-pmic";
                interrupt-parent = <&gpx3>;
                interrupts = <5 IRQ_TYPE_NONE>;
diff --git a/arch/arm/boot/dts/exynos3250-monk.dts 
b/arch/arm/boot/dts/exynos3250-monk.dts
index c1a68e612037..69451566945d 100644
--- a/arch/arm/boot/dts/exynos3250-monk.dts
+++ b/arch/arm/boot/dts/exynos3250-monk.dts
@@ -34,10 +34,10 @@ firmware@205f000 {
                reg = <0x0205F000 0x1000>;
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
 
-               power_key {
+               power-key {
                        gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "power key";
@@ -62,7 +62,7 @@ i2c_max77836: i2c-gpio-0 {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               max77836: subpmic@25 {
+               max77836: pmic@25 {
                        compatible = "maxim,max77836";
                        interrupt-parent = <&gpx1>;
                        interrupts = <5 IRQ_TYPE_NONE>;
@@ -197,7 +197,7 @@ &i2c_0 {
        samsung,i2c-max-bus-freq = <100000>;
        status = "okay";
 
-       s2mps14_pmic@66 {
+       pmic@66 {
                compatible = "samsung,s2mps14-pmic";
                interrupt-parent = <&gpx0>;
                interrupts = <7 IRQ_TYPE_NONE>;
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts 
b/arch/arm/boot/dts/exynos3250-rinato.dts
index b55afaaa691e..a26e3e582a7e 100644
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -38,10 +38,10 @@ firmware@205f000 {
                reg = <0x0205F000 0x1000>;
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
 
-               power_key {
+               power-key {
                        gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "power key";
@@ -62,7 +62,7 @@ i2c_max77836: i2c-gpio-0 {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               max77836: subpmic@25 {
+               max77836: pmic@25 {
                        compatible = "maxim,max77836";
                        interrupt-parent = <&gpx1>;
                        interrupts = <5 IRQ_TYPE_NONE>;
@@ -267,7 +267,7 @@ &i2c_0 {
        samsung,i2c-max-bus-freq = <100000>;
        status = "okay";
 
-       s2mps14_pmic@66 {
+       pmic@66 {
                compatible = "samsung,s2mps14-pmic";
                interrupt-parent = <&gpx0>;
                interrupts = <7 IRQ_TYPE_NONE>;
-- 
2.25.1

Reply via email to