ARM: dts: exynos: adjust node names to DT spec in Exynos542x boards

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-9-krzk@kernel.org

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index dd7f838..bf457d0 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -39,7 +39,7 @@
                };
        };
 
                };
        };
 

-       gpio_keys {
+       gpio-keys {

                compatible = "gpio-keys";
 
                wakeup {
                compatible = "gpio-keys";
 
                wakeup {


@@ -344,7 +344,7 @@
 &hsi2c_4 {
        status = "okay";
 
 &hsi2c_4 {
        status = "okay";
 

-       s2mps11_pmic@66 {
+       pmic@66 {

                compatible = "samsung,s2mps11-pmic";
                reg = <0x66>;
 
                compatible = "samsung,s2mps11-pmic";
                reg = <0x66>;
 

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 2bcbdf8..315b3dc 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -138,7 +138,7 @@
                };
        };
 
                };
        };
 

-       mmc1_pwrseq: mmc1_pwrseq {
+       mmc1_pwrseq: mmc1-pwrseq {

                compatible = "mmc-pwrseq-simple";
                reset-gpios = <&gpx0 0 GPIO_ACTIVE_LOW>; /* WIFI_EN */
                clocks = <&max77802 MAX77802_CLK_32K_CP>;
                compatible = "mmc-pwrseq-simple";
                reset-gpios = <&gpx0 0 GPIO_ACTIVE_LOW>; /* WIFI_EN */
                clocks = <&max77802 MAX77802_CLK_32K_CP>;


@@ -205,7 +205,7 @@
        status = "okay";
        clock-frequency = <400000>;
 
        status = "okay";
        clock-frequency = <400000>;
 

-       max77802: max77802-pmic@9 {
+       max77802: pmic@9 {

                compatible = "maxim,max77802";
                interrupt-parent = <&gpx3>;
                interrupts = <1 IRQ_TYPE_NONE>;
                compatible = "maxim,max77802";
                interrupt-parent = <&gpx3>;
                interrupts = <1 IRQ_TYPE_NONE>;


@@ -615,7 +615,7 @@
        status = "okay";
        clock-frequency = <400000>;
 
        status = "okay";
        clock-frequency = <400000>;
 

-       max98090: codec@10 {
+       max98090: audio-codec@10 {

                compatible = "maxim,max98090";
                reg = <0x10>;
                interrupts = <2 IRQ_TYPE_NONE>;
                compatible = "maxim,max98090";
                reg = <0x10>;
                interrupts = <2 IRQ_TYPE_NONE>;

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 4e49d80..d506da9 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -129,7 +129,7 @@
 &hsi2c_4 {
        status = "okay";
 
 &hsi2c_4 {
        status = "okay";
 

-       s2mps11_pmic@66 {
+       pmic@66 {

                compatible = "samsung,s2mps11-pmic";
                reg = <0x66>;
 
                compatible = "samsung,s2mps11-pmic";
                reg = <0x66>;
 

diff --git a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
index b1cf941..25fb633 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
@@ -503,7 +503,7 @@
 &hsi2c_4 {
        status = "okay";
 
 &hsi2c_4 {
        status = "okay";
 

-       s2mps11_pmic@66 {
+       pmic@66 {

                compatible = "samsung,s2mps11-pmic";
                reg = <0x66>;
                samsung,s2mps11-acokb-ground;
                compatible = "samsung,s2mps11-pmic";
                reg = <0x66>;
                samsung,s2mps11-acokb-ground;

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
index b5ec4f4..86b96f9 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
@@ -40,7 +40,7 @@
 
 &hsi2c_5 {
        status = "okay";
 
 &hsi2c_5 {
        status = "okay";

-       max98090: max98090@10 {
+       max98090: audio-codec@10 {

                compatible = "maxim,max98090";
                reg = <0x10>;
                interrupt-parent = <&gpx3>;
                compatible = "maxim,max98090";
                reg = <0x10>;
                interrupt-parent = <&gpx3>;

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 5da2d81..e35af40 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -13,12 +13,12 @@
 #include "exynos5422-odroid-core.dtsi"
 
 / {
 #include "exynos5422-odroid-core.dtsi"
 
 / {

-       gpio_keys {
+       gpio-keys {

                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&power_key>;
 
                compatible = "gpio-keys";
                pinctrl-names = "default";
                pinctrl-0 = <&power_key>;
 

-               power_key {
+               power-key {

                        /*
                         * The power button (SW2) is connected to the PWRON
                         * pin (active high) of the S2MPS11 PMIC, which acts
                        /*
                         * The power button (SW2) is connected to the PWRON
                         * pin (active high) of the S2MPS11 PMIC, which acts

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3.dts b/arch/arm/boot/dts/exynos5422-odroidxu3.dts
index db0bc17..7c58840 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3.dts
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3.dts
@@ -21,28 +21,28 @@
        status = "okay";
 
        /* A15 cluster: VDD_ARM */
        status = "okay";
 
        /* A15 cluster: VDD_ARM */

-       ina231@40 {
+       power-sensor@40 {

                compatible = "ti,ina231";
                reg = <0x40>;
                shunt-resistor = <10000>;
        };
 
        /* memory: VDD_MEM */
                compatible = "ti,ina231";
                reg = <0x40>;
                shunt-resistor = <10000>;
        };
 
        /* memory: VDD_MEM */

-       ina231@41 {
+       power-sensor@41 {

                compatible = "ti,ina231";
                reg = <0x41>;
                shunt-resistor = <10000>;
        };
 
        /* GPU: VDD_G3D */
                compatible = "ti,ina231";
                reg = <0x41>;
                shunt-resistor = <10000>;
        };
 
        /* GPU: VDD_G3D */

-       ina231@44 {
+       power-sensor@44 {

                compatible = "ti,ina231";
                reg = <0x44>;
                shunt-resistor = <10000>;
        };
 
        /* A7 cluster: VDD_KFC */
                compatible = "ti,ina231";
                reg = <0x44>;
                shunt-resistor = <10000>;
        };
 
        /* A7 cluster: VDD_KFC */

-       ina231@45 {
+       power-sensor@45 {

                compatible = "ti,ina231";
                reg = <0x45>;
                shunt-resistor = <10000>;
                compatible = "ti,ina231";
                reg = <0x45>;
                shunt-resistor = <10000>;

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 60ab0ef..0ce3443 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -138,7 +138,7 @@
                };
        };
 
                };
        };
 

-       mmc1_pwrseq: mmc1_pwrseq {
+       mmc1_pwrseq: mmc1-pwrseq {

                compatible = "mmc-pwrseq-simple";
                reset-gpios = <&gpx0 0 GPIO_ACTIVE_LOW>; /* WIFI_EN */
                clocks = <&max77802 MAX77802_CLK_32K_CP>;
                compatible = "mmc-pwrseq-simple";
                reset-gpios = <&gpx0 0 GPIO_ACTIVE_LOW>; /* WIFI_EN */
                clocks = <&max77802 MAX77802_CLK_32K_CP>;


@@ -214,7 +214,7 @@
        status = "okay";
        clock-frequency = <400000>;
 
        status = "okay";
        clock-frequency = <400000>;
 

-       max77802: max77802-pmic@9 {
+       max77802: pmic@9 {

                compatible = "maxim,max77802";
                interrupt-parent = <&gpx3>;
                interrupts = <1 IRQ_TYPE_NONE>;
                compatible = "maxim,max77802";
                interrupt-parent = <&gpx3>;
                interrupts = <1 IRQ_TYPE_NONE>;