| Message ID | 20201026181528.163143-9-krzk@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM: dts: samsung: minor node name cleanups | expand |
Hi Krzysztof, On 26.10.2020 19:15, Krzysztof Kozlowski wrote: > 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> > --- > arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 ++-- > arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 ++-- > arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +- > arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- > arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +- > arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 ++-- > arch/arm/boot/dts/exynos5422-odroidxu3.dts | 8 ++++---- > arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 ++-- > 8 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts > index dd7f8385d81e..bf457d0c02eb 100644 > --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts > +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts > @@ -39,7 +39,7 @@ oscclk { > }; > }; > > - gpio_keys { > + gpio-keys { > compatible = "gpio-keys"; > > wakeup { > @@ -344,7 +344,7 @@ &hdmi { > &hsi2c_4 { > status = "okay"; > > - s2mps11_pmic@66 { > + pmic@66 { > 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 2bcbdf8a39bf..d54392fe6260 100644 > --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts > +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts > @@ -138,7 +138,7 @@ panel_in: endpoint { > }; > }; > > - 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>; > @@ -205,7 +205,7 @@ &hsi2c_4 { > status = "okay"; > clock-frequency = <400000>; > > - max77802: max77802-pmic@9 { > + max77802: pmic@9 { > compatible = "maxim,max77802"; > interrupt-parent = <&gpx3>; > interrupts = <1 IRQ_TYPE_NONE>; > diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts > index 4e49d8095b29..d506da9fa661 100644 > --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts > +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts > @@ -129,7 +129,7 @@ &hdmi { > &hsi2c_4 { > status = "okay"; > > - s2mps11_pmic@66 { > + pmic@66 { > 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 b1cf9414ce17..25fb6331c75e 100644 > --- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi > +++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi > @@ -503,7 +503,7 @@ &dmc { > &hsi2c_4 { > status = "okay"; > > - s2mps11_pmic@66 { > + pmic@66 { > 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 b5ec4f47eb3a..f5f9c077df74 100644 > --- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi > +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi > @@ -40,7 +40,7 @@ codec { > > &hsi2c_5 { > status = "okay"; > - max98090: max98090@10 { > + max98090: codec@10 { > 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 5da2d81e3be2..e35af40a55cb 100644 > --- 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" > > / { > - gpio_keys { > + gpio-keys { > 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 > diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3.dts b/arch/arm/boot/dts/exynos5422-odroidxu3.dts > index d0f6ac5fa79d..5ff493ecb6ff 100644 > --- a/arch/arm/boot/dts/exynos5422-odroidxu3.dts > +++ b/arch/arm/boot/dts/exynos5422-odroidxu3.dts > @@ -21,28 +21,28 @@ &i2c_0 { > status = "okay"; > > /* A15 cluster: VDD_ARM */ > - ina231@40 { > + sensor@40 { power-sensor? > compatible = "ti,ina231"; > reg = <0x40>; > shunt-resistor = <10000>; > }; > > /* memory: VDD_MEM */ > - ina231@41 { > + sensor@41 { > compatible = "ti,ina231"; > reg = <0x41>; > shunt-resistor = <10000>; > }; > > /* GPU: VDD_G3D */ > - ina231@44 { > + sensor@44 { > compatible = "ti,ina231"; > reg = <0x44>; > shunt-resistor = <10000>; > }; > > /* A7 cluster: VDD_KFC */ > - ina231@45 { > + sensor@45 { > 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 60ab0effe474..0ce3443d39a8 100644 > --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts > +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts > @@ -138,7 +138,7 @@ panel_in: endpoint { > }; > }; > > - 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>; > @@ -214,7 +214,7 @@ &hsi2c_4 { > status = "okay"; > clock-frequency = <400000>; > > - max77802: max77802-pmic@9 { > + max77802: pmic@9 { > compatible = "maxim,max77802"; > interrupt-parent = <&gpx3>; > interrupts = <1 IRQ_TYPE_NONE>; Best regards
On Mon, Oct 26, 2020 at 10:47:47PM +0100, Marek Szyprowski wrote: > Hi Krzysztof, > > On 26.10.2020 19:15, Krzysztof Kozlowski wrote: > > 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> > > --- > > arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 ++-- > > arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 ++-- > > arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +- > > arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- > > arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +- > > arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 ++-- > > arch/arm/boot/dts/exynos5422-odroidxu3.dts | 8 ++++---- > > arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 ++-- > > 8 files changed, 15 insertions(+), 15 deletions(-) > > > > diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts > > index dd7f8385d81e..bf457d0c02eb 100644 > > --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts > > +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts > > @@ -39,7 +39,7 @@ oscclk { > > }; > > }; > > > > - gpio_keys { > > + gpio-keys { > > compatible = "gpio-keys"; > > > > wakeup { > > @@ -344,7 +344,7 @@ &hdmi { > > &hsi2c_4 { > > status = "okay"; > > > > - s2mps11_pmic@66 { > > + pmic@66 { > > 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 2bcbdf8a39bf..d54392fe6260 100644 > > --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts > > +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts > > @@ -138,7 +138,7 @@ panel_in: endpoint { > > }; > > }; > > > > - 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>; > > @@ -205,7 +205,7 @@ &hsi2c_4 { > > status = "okay"; > > clock-frequency = <400000>; > > > > - max77802: max77802-pmic@9 { > > + max77802: pmic@9 { > > compatible = "maxim,max77802"; > > interrupt-parent = <&gpx3>; > > interrupts = <1 IRQ_TYPE_NONE>; > > diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts > > index 4e49d8095b29..d506da9fa661 100644 > > --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts > > +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts > > @@ -129,7 +129,7 @@ &hdmi { > > &hsi2c_4 { > > status = "okay"; > > > > - s2mps11_pmic@66 { > > + pmic@66 { > > 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 b1cf9414ce17..25fb6331c75e 100644 > > --- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi > > +++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi > > @@ -503,7 +503,7 @@ &dmc { > > &hsi2c_4 { > > status = "okay"; > > > > - s2mps11_pmic@66 { > > + pmic@66 { > > 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 b5ec4f47eb3a..f5f9c077df74 100644 > > --- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi > > +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi > > @@ -40,7 +40,7 @@ codec { > > > > &hsi2c_5 { > > status = "okay"; > > - max98090: max98090@10 { > > + max98090: codec@10 { > > 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 5da2d81e3be2..e35af40a55cb 100644 > > --- 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" > > > > / { > > - gpio_keys { > > + gpio-keys { > > 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 > > diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3.dts b/arch/arm/boot/dts/exynos5422-odroidxu3.dts > > index d0f6ac5fa79d..5ff493ecb6ff 100644 > > --- a/arch/arm/boot/dts/exynos5422-odroidxu3.dts > > +++ b/arch/arm/boot/dts/exynos5422-odroidxu3.dts > > @@ -21,28 +21,28 @@ &i2c_0 { > > status = "okay"; > > > > /* A15 cluster: VDD_ARM */ > > - ina231@40 { > > + sensor@40 { > power-sensor? Good point, thanks! Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts index dd7f8385d81e..bf457d0c02eb 100644 --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts @@ -39,7 +39,7 @@ oscclk { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; wakeup { @@ -344,7 +344,7 @@ &hdmi { &hsi2c_4 { status = "okay"; - s2mps11_pmic@66 { + pmic@66 { 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 2bcbdf8a39bf..d54392fe6260 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -138,7 +138,7 @@ panel_in: endpoint { }; }; - 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>; @@ -205,7 +205,7 @@ &hsi2c_4 { status = "okay"; clock-frequency = <400000>; - max77802: max77802-pmic@9 { + max77802: pmic@9 { compatible = "maxim,max77802"; interrupt-parent = <&gpx3>; interrupts = <1 IRQ_TYPE_NONE>; diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts index 4e49d8095b29..d506da9fa661 100644 --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts @@ -129,7 +129,7 @@ &hdmi { &hsi2c_4 { status = "okay"; - s2mps11_pmic@66 { + pmic@66 { 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 b1cf9414ce17..25fb6331c75e 100644 --- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi @@ -503,7 +503,7 @@ &dmc { &hsi2c_4 { status = "okay"; - s2mps11_pmic@66 { + pmic@66 { 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 b5ec4f47eb3a..f5f9c077df74 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi @@ -40,7 +40,7 @@ codec { &hsi2c_5 { status = "okay"; - max98090: max98090@10 { + max98090: codec@10 { 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 5da2d81e3be2..e35af40a55cb 100644 --- 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" / { - gpio_keys { + gpio-keys { 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 diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3.dts b/arch/arm/boot/dts/exynos5422-odroidxu3.dts index d0f6ac5fa79d..5ff493ecb6ff 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3.dts +++ b/arch/arm/boot/dts/exynos5422-odroidxu3.dts @@ -21,28 +21,28 @@ &i2c_0 { status = "okay"; /* A15 cluster: VDD_ARM */ - ina231@40 { + sensor@40 { compatible = "ti,ina231"; reg = <0x40>; shunt-resistor = <10000>; }; /* memory: VDD_MEM */ - ina231@41 { + sensor@41 { compatible = "ti,ina231"; reg = <0x41>; shunt-resistor = <10000>; }; /* GPU: VDD_G3D */ - ina231@44 { + sensor@44 { compatible = "ti,ina231"; reg = <0x44>; shunt-resistor = <10000>; }; /* A7 cluster: VDD_KFC */ - ina231@45 { + sensor@45 { 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 60ab0effe474..0ce3443d39a8 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -138,7 +138,7 @@ panel_in: endpoint { }; }; - 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>; @@ -214,7 +214,7 @@ &hsi2c_4 { status = "okay"; clock-frequency = <400000>; - max77802: max77802-pmic@9 { + max77802: pmic@9 { compatible = "maxim,max77802"; interrupt-parent = <&gpx3>; interrupts = <1 IRQ_TYPE_NONE>;
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> --- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 ++-- arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 ++-- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +- arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +- arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 ++-- arch/arm/boot/dts/exynos5422-odroidxu3.dts | 8 ++++---- arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-)