ARM: dts: samsung: minor node name cleanups
Subsystems (2)
Krzysztof Kozlowski
maintainerv2 cover ARM: dts: samsung: minor node name cleanups
Hi All,
Changes since v1
================
1. Use names proposed by Marek (light-sensor, audio-codec, image-sensor, power-sensor),
2. Use amplifier in max98504 node name.
Description
===========
A new Exynos4412 board was recently submitted and it (as expected) copied all not-the-best patterns from existing DTSes. Let's fix few of them so any new boards will not copy old choices.
Best regards,
Krzysztof
Krzysztof Kozlowski (12):
ARM: dts: exynos: adjust node names to DT spec in Exynos3250 boards
ARM: dts: exynos: adjust node names to DT spec in Exynos4210 boards
ARM: dts: exynos: override GPIO keys node by label in Exynos4412
Odroid family
ARM: dts: exynos: adjust node names to DT spec in Exynos4412 boards
ARM: dts: exynos: remove redundant status=okay in Exynos4412 boards
ARM: dts: exynos: adjust node names to DT spec in Exynos5250 boards
ARM: dts: exynos: adjust node names to DT spec in Odroid XU
ARM: dts: exynos: adjust node names to DT spec in Exynos542x boards
ARM: dts: s5pv210: adjust node names to DT spec
arm64: dts: exynos: adjust node names to DT spec in Exynos5433 TM2
arm64: dts: exynos: adjust node names to DT spec in Exynos7 Espresso
arm64: dts: exynos: remove redundant status=okay in Exynos5433 TM2
arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- arch/arm/boot/dts/exynos3250-monk.dts | 8 +++--- arch/arm/boot/dts/exynos3250-rinato.dts | 8 +++--- 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 +-- arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 9 +++--- arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- .../boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- arch/arm/boot/dts/exynos4412-midas.dtsi | 17 +++++------ arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- .../boot/dts/exynos4412-odroid-common.dtsi | 10 +++---- arch/arm/boot/dts/exynos4412-odroidx.dts | 28 +++++++++---------- arch/arm/boot/dts/exynos4412-origen.dts | 14 +++++----- arch/arm/boot/dts/exynos4412-smdk4412.dts | 20 ++++++------- arch/arm/boot/dts/exynos5250-arndale.dts | 6 ++-- arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 +-- arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +-- arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +- arch/arm/boot/dts/exynos5250-snow.dts | 2 +- arch/arm/boot/dts/exynos5250-spring.dts | 2 +- arch/arm/boot/dts/exynos5410-odroidxu.dts | 2 +- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 +-- arch/arm/boot/dts/exynos5420-peach-pit.dts | 6 ++-- arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 +- arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- .../boot/dts/exynos5422-odroidxu3-audio.dtsi | 2 +- .../boot/dts/exynos5422-odroidxu3-common.dtsi | 4 +-- arch/arm/boot/dts/exynos5422-odroidxu3.dts | 8 +++--- arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +-- arch/arm/boot/dts/s5pv210-aquila.dts | 12 ++++---- arch/arm/boot/dts/s5pv210-aries.dtsi | 4 +-- arch/arm/boot/dts/s5pv210-goni.dts | 14 +++++----- arch/arm/boot/dts/s5pv210-smdkv210.dts | 20 ++++++------- .../dts/exynos/exynos5433-tm2-common.dtsi | 11 ++++---- .../boot/dts/exynos/exynos7-espresso.dts | 2 +- 37 files changed, 135 insertions(+), 140 deletions(-)
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 1/12 ARM: dts: exynos: adjust node names to DT spec in Exynos3250 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.
--- 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(-)
arch/arm/boot/dts/exynos3250-artik5.dtsi +1 -1
@@ -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>;
arch/arm/boot/dts/exynos3250-monk.dts +4 -4
@@ -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>;
arch/arm/boot/dts/exynos3250-rinato.dts +4 -4
@@ -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>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 2/12 ARM: dts: exynos: adjust node names to DT spec in Exynos4210 boards
In reply to Krzysztof KozlowskiThe 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.
--- 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(-)
arch/arm/boot/dts/exynos4210-i9100.dts +3 -3
@@ -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>;
arch/arm/boot/dts/exynos4210-origen.dts +2 -2
@@ -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>;
arch/arm/boot/dts/exynos4210-smdkv310.dts +11 -11
@@ -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";
arch/arm/boot/dts/exynos4210-trats.dts +2 -2
@@ -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>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 3/12 ARM: dts: exynos: override GPIO keys node by label in Exynos4412 Odroid family
In reply to Krzysztof KozlowskiUsing full paths to extend or override a device tree node is error prone. If there was a typo error, a new node will be created instead of extending the existing node. This will lead to run-time errors that could be hard to detect.
A mistyped label on the other hand, will cause a dtc compile error (during build time).
--- .../boot/dts/exynos4412-odroid-common.dtsi | 2 +- arch/arm/boot/dts/exynos4412-odroidx.dts | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-)
arch/arm/boot/dts/exynos4412-odroid-common.dtsi +1 -1
@@ -22,7 +22,7 @@ firmware@204f000 { reg = <0x0204F000 0x1000>; }; - gpio_keys { + gpio_keys: gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; pinctrl-0 = <&gpio_power_key>;
arch/arm/boot/dts/exynos4412-odroidx.dts +12 -12
@@ -36,18 +36,6 @@ led2 { }; }; - gpio_keys { - pinctrl-0 = <&gpio_power_key &gpio_home_key>; - - home_key { - gpios = <&gpx2 2 GPIO_ACTIVE_HIGH>; - linux,code = <KEY_HOME>; - label = "home key"; - debounce-interval = <10>; - wakeup-source; - }; - }; - regulator_p3v3 { compatible = "regulator-fixed"; regulator-name = "p3v3_en";
@@ -76,6 +64,18 @@ &ehci { phy-names = "hsic0"; }; +&gpio_keys { + pinctrl-0 = <&gpio_power_key &gpio_home_key>; + + home-key { + gpios = <&gpx2 2 GPIO_ACTIVE_HIGH>; + linux,code = <KEY_HOME>; + label = "home key"; + debounce-interval = <10>; + wakeup-source; + }; +}; + &mshc_0 { vqmmc-supply = <&buck8_reg>; };
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 4/12 ARM: dts: exynos: adjust node names to DT spec in Exynos4412 boards
In reply to Krzysztof KozlowskiThe 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.
--- arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 8 ++++---- arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- .../boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- arch/arm/boot/dts/exynos4412-midas.dtsi | 14 ++++++------- arch/arm/boot/dts/exynos4412-n710x.dts | 2 +- .../boot/dts/exynos4412-odroid-common.dtsi | 8 ++++---- arch/arm/boot/dts/exynos4412-odroidx.dts | 4 ++-- arch/arm/boot/dts/exynos4412-origen.dts | 14 ++++++------- arch/arm/boot/dts/exynos4412-smdk4412.dts | 20 +++++++++---------- 9 files changed, 37 insertions(+), 37 deletions(-)
arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi +4 -4
@@ -15,7 +15,7 @@ aliases { i2c10 = &i2c_cm36651; }; - aat1290 { + led-controller { compatible = "skyworks,aat1290"; flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>; enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>;
@@ -60,7 +60,7 @@ i2c_ak8975: i2c-gpio-0 { #size-cells = <0>; status = "okay"; - ak8975@c { + magnetometer@c { compatible = "asahi-kasei,ak8975"; reg = <0x0c>; gpios = <&gpj0 7 GPIO_ACTIVE_HIGH>;
@@ -75,7 +75,7 @@ i2c_cm36651: i2c-gpio-2 { #address-cells = <1>; #size-cells = <0>; - cm36651@18 { + light-sensor@18 { compatible = "capella,cm36651"; reg = <0x18>; interrupt-parent = <&gpx0>;
@@ -133,7 +133,7 @@ timing-0 { }; &i2c_3 { - mms114-touchscreen@48 { + touchscreen@48 { compatible = "melfas,mms114"; reg = <0x48>; interrupt-parent = <&gpm2>;
arch/arm/boot/dts/exynos4412-itop-elite.dts +1 -1
@@ -175,7 +175,7 @@ &i2c_4 { pinctrl-names = "default"; status = "okay"; - codec: wm8960@1a { + codec: audio-codec@1a { compatible = "wlf,wm8960"; reg = <0x1a>; clocks = <&pmu_system_controller 0>;
arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi +1 -1
@@ -134,7 +134,7 @@ &i2c_1 { pinctrl-names = "default"; status = "okay"; - s5m8767: s5m8767-pmic@66 { + s5m8767: pmic@66 { compatible = "samsung,s5m8767-pmic"; reg = <0x66>;
arch/arm/boot/dts/exynos4412-midas.dtsi +7 -7
@@ -171,7 +171,7 @@ i2c_max77693: i2c-gpio-1 { #size-cells = <0>; status = "okay"; - max77693@66 { + pmic@66 { compatible = "maxim,max77693"; interrupt-parent = <&gpx1>; interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
@@ -220,7 +220,7 @@ i2c_max77693_fuel: i2c-gpio-3 { #size-cells = <0>; status = "okay"; - max77693-fuel-gauge@36 { + fuel-gauge@36 { compatible = "maxim,max17047"; interrupt-parent = <&gpx2>; interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
@@ -550,7 +550,7 @@ &i2c_0 { pinctrl-names = "default"; status = "okay"; - s5c73m3: s5c73m3@3c { + s5c73m3: image-sensor@3c { compatible = "samsung,s5c73m3"; reg = <0x3c>; xshutdown-gpios = <&gpf1 3 GPIO_ACTIVE_LOW>; /* ISP_RESET */
@@ -577,7 +577,7 @@ &i2c1_isp { pinctrl-0 = <&fimc_is_i2c1>; pinctrl-names = "default"; - s5k6a3@10 { + image-sensor@10 { compatible = "samsung,s5k6a3"; reg = <0x10>; svdda-supply = <&cam_io_reg>;
@@ -616,7 +616,7 @@ &i2c_4 { pinctrl-names = "default"; status = "okay"; - wm1811: wm1811@1a { + wm1811: audio-codec@1a { compatible = "wlf,wm1811"; reg = <0x1a>; clocks = <&pmu_system_controller 0>,
@@ -665,7 +665,7 @@ &i2c_7 { pinctrl-names = "default"; status = "okay"; - max77686: max77686_pmic@9 { + max77686: pmic@9 { compatible = "maxim,max77686"; interrupt-parent = <&gpx0>; interrupts = <7 IRQ_TYPE_NONE>;
@@ -1407,7 +1407,7 @@ &spi_1 { cs-gpios = <&gpb 5 GPIO_ACTIVE_HIGH>; status = "okay"; - s5c73m3_spi: s5c73m3@0 { + s5c73m3_spi: image-sensor@0 { compatible = "samsung,s5c73m3"; spi-max-frequency = <50000000>; reg = <0>;
arch/arm/boot/dts/exynos4412-n710x.dts +1 -1
@@ -45,7 +45,7 @@ &i2c_3 { pinctrl-names = "default"; status = "okay"; - mms152-touchscreen@48 { + touchscreen@48 { compatible = "melfas,mms152"; reg = <0x48>; interrupt-parent = <&gpm2>;
arch/arm/boot/dts/exynos4412-odroid-common.dtsi +4 -4
@@ -27,7 +27,7 @@ gpio_keys: gpio-keys { pinctrl-names = "default"; pinctrl-0 = <&gpio_power_key>; - power_key { + power-key { gpios = <&gpx1 3 GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; label = "power key";
@@ -171,7 +171,7 @@ cooling_map1: map1 { }; &pinctrl_1 { - gpio_power_key: power_key { + gpio_power_key: power-key { samsung,pins = "gpx1-3"; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; };
@@ -266,7 +266,7 @@ &i2c_0 { samsung,i2c-max-bus-freq = <400000>; status = "okay"; - usb3503: usb3503@8 { + usb3503: usb-hub@8 { compatible = "smsc,usb3503"; reg = <0x08>;
@@ -492,7 +492,7 @@ buck8_reg: BUCK8 { &i2c_1 { status = "okay"; - max98090: max98090@10 { + max98090: audio-codec@10 { compatible = "maxim,max98090"; reg = <0x10>; interrupt-parent = <&gpx0>;
arch/arm/boot/dts/exynos4412-odroidx.dts +2 -2
@@ -36,7 +36,7 @@ led2 { }; }; - regulator_p3v3 { + regulator-1 { compatible = "regulator-fixed"; regulator-name = "p3v3_en"; regulator-min-microvolt = <3300000>;
@@ -81,7 +81,7 @@ &mshc_0 { }; &pinctrl_1 { - gpio_home_key: home_key { + gpio_home_key: home-key { samsung,pins = "gpx2-2"; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; };
arch/arm/boot/dts/exynos4412-origen.dts +7 -7
@@ -116,7 +116,7 @@ &i2c_0 { pinctrl-names = "default"; status = "okay"; - s5m8767_pmic@66 { + pmic@66 { compatible = "samsung,s5m8767-pmic"; reg = <0x66>;
@@ -453,37 +453,37 @@ &keypad { pinctrl-names = "default"; status = "okay"; - key_home { + key-home { keypad,row = <0>; keypad,column = <0>; linux,code = <KEY_HOME>; }; - key_down { + key-down { keypad,row = <0>; keypad,column = <1>; linux,code = <KEY_DOWN>; }; - key_up { + key-up { keypad,row = <1>; keypad,column = <0>; linux,code = <KEY_UP>; }; - key_menu { + key-menu { keypad,row = <1>; keypad,column = <1>; linux,code = <KEY_MENU>; }; - key_back { + key-back { keypad,row = <2>; keypad,column = <0>; linux,code = <KEY_BACK>; }; - key_enter { + key-enter { keypad,row = <2>; keypad,column = <1>; linux,code = <KEY_ENTER>;
arch/arm/boot/dts/exynos4412-smdk4412.dts +10 -10
@@ -71,61 +71,61 @@ &keypad { pinctrl-names = "default"; status = "okay"; - key_1 { + key-1 { keypad,row = <1>; keypad,column = <3>; linux,code = <2>; }; - key_2 { + key-2 { keypad,row = <1>; keypad,column = <4>; linux,code = <3>; }; - key_3 { + key-3 { keypad,row = <1>; keypad,column = <5>; linux,code = <4>; }; - key_4 { + key-4 { keypad,row = <1>; keypad,column = <6>; linux,code = <5>; }; - key_5 { + key-5 { keypad,row = <1>; keypad,column = <7>; linux,code = <6>; }; - key_A { + key-A { keypad,row = <2>; keypad,column = <6>; linux,code = <30>; }; - key_B { + key-B { keypad,row = <2>; keypad,column = <7>; linux,code = <48>; }; - key_C { + key-C { keypad,row = <0>; keypad,column = <5>; linux,code = <46>; }; - key_D { + key-D { keypad,row = <2>; keypad,column = <5>; linux,code = <32>; }; - key_E { + key-E { keypad,row = <0>; keypad,column = <7>; linux,code = <18>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 5/12 ARM: dts: exynos: remove redundant status=okay in Exynos4412 boards
In reply to Krzysztof KozlowskiNew nodes are enabled by default, so status=okay is not needed for them.
---
Not actually tested on the HW, just checked the output DTB.
--- arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 1 - arch/arm/boot/dts/exynos4412-midas.dtsi | 3 --- 2 files changed, 4 deletions(-)
arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi +0 -1
@@ -58,7 +58,6 @@ i2c_ak8975: i2c-gpio-0 { i2c-gpio,delay-us = <2>; #address-cells = <1>; #size-cells = <0>; - status = "okay"; magnetometer@c { compatible = "asahi-kasei,ak8975";
arch/arm/boot/dts/exynos4412-midas.dtsi +0 -3
@@ -169,7 +169,6 @@ i2c_max77693: i2c-gpio-1 { i2c-gpio,delay-us = <2>; #address-cells = <1>; #size-cells = <0>; - status = "okay"; pmic@66 { compatible = "maxim,max77693";
@@ -218,7 +217,6 @@ i2c_max77693_fuel: i2c-gpio-3 { i2c-gpio,delay-us = <2>; #address-cells = <1>; #size-cells = <0>; - status = "okay"; fuel-gauge@36 { compatible = "maxim,max17047";
@@ -262,7 +260,6 @@ i2c-mhl { pinctrl-0 = <&i2c_mhl_bus>; pinctrl-names = "default"; - status = "okay"; sii9234: hdmi-bridge@39 { compatible = "sil,sii9234";
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 6/12 ARM: dts: exynos: adjust node names to DT spec in Exynos5250 boards
In reply to Krzysztof KozlowskiThe 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.
--- arch/arm/boot/dts/exynos5250-arndale.dts | 6 +++--- arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 ++-- arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 ++-- arch/arm/boot/dts/exynos5250-snow-rev5.dts | 2 +- arch/arm/boot/dts/exynos5250-snow.dts | 2 +- arch/arm/boot/dts/exynos5250-spring.dts | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/exynos5250-arndale.dts +3 -3
@@ -27,7 +27,7 @@ chosen { stdout-path = "serial2:115200n8"; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; menu {
@@ -211,7 +211,7 @@ &i2c_0 { samsung,i2c-max-bus-freq = <20000>; samsung,i2c-slave-addr = <0x66>; - s5m8767_pmic@66 { + pmic@66 { compatible = "samsung,s5m8767-pmic"; reg = <0x66>; interrupt-parent = <&gpx3>;
@@ -511,7 +511,7 @@ buck9_reg: BUCK9 { &i2c_3 { status = "okay"; - wm1811: codec@1a { + wm1811: audio-codec@1a { compatible = "wlf,wm1811"; reg = <0x1a>; clocks = <&i2s0 CLK_I2S_CDCLK>;
arch/arm/boot/dts/exynos5250-smdk5250.dts +2 -2
@@ -290,7 +290,7 @@ eeprom@51 { reg = <0x51>; }; - wm8994: wm8994@1a { + wm8994: audio-codec@1a { compatible = "wlf,wm8994"; reg = <0x1a>;
@@ -385,7 +385,7 @@ &spi_1 { status = "okay"; cs-gpios = <&gpa2 5 GPIO_ACTIVE_HIGH>; - w25q80bw@0 { + flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "w25x80";
arch/arm/boot/dts/exynos5250-snow-common.dtsi +2 -2
@@ -217,7 +217,7 @@ panel_in: endpoint { }; }; - mmc3_pwrseq: mmc3_pwrseq { + mmc3_pwrseq: mmc3-pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpx0 2 GPIO_ACTIVE_LOW>, /* WIFI_RSTn */ <&gpx0 1 GPIO_ACTIVE_LOW>; /* WIFI_EN */
@@ -289,7 +289,7 @@ &i2c_0 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>; - max77686: max77686@9 { + max77686: pmic@9 { compatible = "maxim,max77686"; interrupt-parent = <&gpx3>; interrupts = <2 IRQ_TYPE_NONE>;
arch/arm/boot/dts/exynos5250-snow-rev5.dts +1 -1
@@ -32,7 +32,7 @@ codec { }; &i2c_7 { - max98090: codec@10 { + max98090: audio-codec@10 { compatible = "maxim,max98090"; reg = <0x10>; interrupts = <4 IRQ_TYPE_NONE>;
arch/arm/boot/dts/exynos5250-snow.dts +1 -1
@@ -30,7 +30,7 @@ codec { }; &i2c_7 { - max98095: codec@11 { + max98095: audio-codec@11 { compatible = "maxim,max98095"; reg = <0x11>; pinctrl-names = "default";
arch/arm/boot/dts/exynos5250-spring.dts +1 -1
@@ -105,7 +105,7 @@ &i2c_0 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <378000>; - s5m8767-pmic@66 { + pmic@66 { compatible = "samsung,s5m8767-pmic"; reg = <0x66>; interrupt-parent = <&gpx3>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 7/12 ARM: dts: exynos: adjust node names to DT spec in Odroid XU
In reply to Krzysztof KozlowskiThe 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.
--- arch/arm/boot/dts/exynos5410-odroidxu.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/exynos5410-odroidxu.dts +1 -1
@@ -498,7 +498,7 @@ ldo35_reg: LDO35 { &i2c_1 { status = "okay"; - max98090: max98090@10 { + max98090: audio-codec@10 { compatible = "maxim,max98090"; reg = <0x10>; interrupt-parent = <&gpj3>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 8/12 ARM: dts: exynos: adjust node names to DT spec in Exynos542x boards
In reply to Krzysztof KozlowskiThe 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.
--- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 ++-- arch/arm/boot/dts/exynos5420-peach-pit.dts | 6 +++--- 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, 16 insertions(+), 16 deletions(-)
arch/arm/boot/dts/exynos5420-arndale-octa.dts +2 -2
@@ -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>;
arch/arm/boot/dts/exynos5420-peach-pit.dts +3 -3
@@ -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>;
@@ -615,7 +615,7 @@ &hsi2c_7 { status = "okay"; clock-frequency = <400000>; - max98090: codec@10 { + max98090: audio-codec@10 { compatible = "maxim,max98090"; reg = <0x10>; interrupts = <2 IRQ_TYPE_NONE>;
arch/arm/boot/dts/exynos5420-smdk5420.dts +1 -1
@@ -129,7 +129,7 @@ &hdmi { &hsi2c_4 { status = "okay"; - s2mps11_pmic@66 { + pmic@66 { compatible = "samsung,s2mps11-pmic"; reg = <0x66>;
arch/arm/boot/dts/exynos5422-odroid-core.dtsi +1 -1
@@ -503,7 +503,7 @@ &dmc { &hsi2c_4 { status = "okay"; - s2mps11_pmic@66 { + pmic@66 { compatible = "samsung,s2mps11-pmic"; reg = <0x66>; samsung,s2mps11-acokb-ground;
arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi +1 -1
@@ -40,7 +40,7 @@ codec { &hsi2c_5 { status = "okay"; - max98090: max98090@10 { + max98090: audio-codec@10 { compatible = "maxim,max98090"; reg = <0x10>; interrupt-parent = <&gpx3>;
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +2 -2
@@ -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
arch/arm/boot/dts/exynos5422-odroidxu3.dts +4 -4
@@ -21,28 +21,28 @@ &i2c_0 { status = "okay"; /* A15 cluster: VDD_ARM */ - ina231@40 { + power-sensor@40 { 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 */ - ina231@44 { + power-sensor@44 { 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>;
arch/arm/boot/dts/exynos5800-peach-pi.dts +2 -2
@@ -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>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 9/12 ARM: dts: s5pv210: adjust node names to DT spec
In reply to Krzysztof KozlowskiThe 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.
--- arch/arm/boot/dts/s5pv210-aquila.dts | 12 ++++++------ arch/arm/boot/dts/s5pv210-aries.dtsi | 4 ++-- arch/arm/boot/dts/s5pv210-goni.dts | 14 +++++++------- arch/arm/boot/dts/s5pv210-smdkv210.dts | 20 ++++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-)
arch/arm/boot/dts/s5pv210-aquila.dts +6 -6
@@ -277,37 +277,37 @@ &keypad { <&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>;
arch/arm/boot/dts/s5pv210-aries.dtsi +2 -2
@@ -54,7 +54,7 @@ pmic_ap_clk: clock-0 { clock-frequency = <32768>; }; - bt_codec: bt_sco { + bt_codec: bt-sco { compatible = "linux,bt-sco"; #sound-dai-cells = <0>; };
@@ -113,7 +113,7 @@ i2c_sound: i2c-gpio-0 { pinctrl-names = "default"; pinctrl-0 = <&sound_i2c_pins>; - wm8994: wm8994@1a { + wm8994: audio-codec@1a { compatible = "wlf,wm8994"; reg = <0x1a>;
arch/arm/boot/dts/s5pv210-goni.dts +7 -7
@@ -259,37 +259,37 @@ &keypad { <&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 @@ &i2c2 { samsung,i2c-slave-addr = <0x10>; status = "okay"; - tsp@4a { + touchscreen@4a { compatible = "atmel,maxtouch"; reg = <0x4a>; interrupt-parent = <&gpj0>;
arch/arm/boot/dts/s5pv210-smdkv210.dts +10 -10
@@ -76,61 +76,61 @@ &keypad { <&keypad_col6>, <&keypad_col7>; status = "okay"; - key_1 { + key-1 { keypad,row = <0>; keypad,column = <3>; linux,code = <KEY_1>; }; - key_2 { + key-2 { keypad,row = <0>; keypad,column = <4>; linux,code = <KEY_2>; }; - key_3 { + key-3 { keypad,row = <0>; keypad,column = <5>; linux,code = <KEY_3>; }; - key_4 { + key-4 { keypad,row = <0>; keypad,column = <6>; linux,code = <KEY_4>; }; - key_5 { + key-5 { keypad,row = <0 >; keypad,column = <7>; linux,code = <KEY_5>; }; - key_6 { + key-6 { keypad,row = <1>; keypad,column = <3>; linux,code = <KEY_A>; }; - key_7 { + key-7 { keypad,row = <1>; keypad,column = <4>; linux,code = <KEY_B>; }; - key_8 { + key-8 { keypad,row = <1>; keypad,column = <5>; linux,code = <KEY_C>; }; - key_9 { + key-9 { keypad,row = <1>; keypad,column = <6>; linux,code = <KEY_D>; }; - key_10 { + key-10 { keypad,row = <1>; keypad,column = <7>; linux,code = <KEY_E>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 10/12 arm64: dts: exynos: adjust node names to DT spec in Exynos5433 TM2
In reply to Krzysztof KozlowskiThe 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.
--- arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +5 -5
@@ -94,7 +94,7 @@ i2c_max98504: i2c-gpio-0 { #size-cells = <0>; status = "okay"; - max98504: max98504@31 { + max98504: amplifier@31 { compatible = "maxim,max98504"; reg = <0x31>; maxim,rx-path = <1>;
@@ -386,7 +386,7 @@ &hsi2c_0 { status = "okay"; clock-frequency = <2500000>; - s2mps13-pmic@66 { + pmic@66 { compatible = "samsung,s2mps13-pmic"; interrupt-parent = <&gpa0>; interrupts = <7 IRQ_TYPE_NONE>;
@@ -817,7 +817,7 @@ &hsi2c_7 { status = "okay"; clock-frequency = <1000000>; - sii8620@39 { + bridge@39 { reg = <0x39>; compatible = "sil,sii8620"; cvcc10-supply = <&ldo36_reg>;
@@ -852,7 +852,7 @@ mhl_to_musb_con: endpoint { &hsi2c_8 { status = "okay"; - max77843@66 { + pmic@66 { compatible = "maxim,max77843"; interrupt-parent = <&gpa1>; interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
@@ -1231,7 +1231,7 @@ &spi_1 { cs-gpios = <&gpd6 3 GPIO_ACTIVE_HIGH>; status = "okay"; - wm5110: wm5110-codec@0 { + wm5110: audio-codec@0 { compatible = "wlf,wm5110"; reg = <0x0>; spi-max-frequency = <20000000>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 11/12 arm64: dts: exynos: adjust node names to DT spec in Exynos7 Espresso
In reply to Krzysztof KozlowskiThe 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.
--- arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/exynos/exynos7-espresso.dts +1 -1
@@ -87,7 +87,7 @@ &hsi2c_4 { samsung,i2c-max-bus-freq = <200000>; status = "okay"; - s2mps15_pmic@66 { + pmic@66 { compatible = "samsung,s2mps15-pmic"; reg = <0x66>; interrupts = <2 IRQ_TYPE_NONE>;
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerPATCH v2 12/12 arm64: dts: exynos: remove redundant status=okay in Exynos5433 TM2
In reply to Krzysztof KozlowskiNew nodes are enabled by default, so status=okay is not needed for them.
---
Not actually tested on the HW, just checked the output DTB.
--- arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +0 -1
@@ -92,7 +92,6 @@ i2c_max98504: i2c-gpio-0 { i2c-gpio,delay-us = <2>; #address-cells = <1>; #size-cells = <0>; - status = "okay"; max98504: amplifier@31 { compatible = "maxim,max98504";
Signature · 1 line
2.25.1
Krzysztof Kozlowski
maintainerQuoted 8 lines · Krzysztof Kozlowski
Hi All,
Changes since v1
================
1. Use names proposed by Marek (light-sensor, audio-codec, image-sensor, power-sensor),
2. Use amplifier in max98504 node name.
Applied all twelve.
Best regards,
Krzysztof
Quoted 9 lines
Description
===========
A new Exynos4412 board was recently submitted and it (as expected) copied all not-the-best patterns from existing DTSes. Let's fix few of them so any new boards will not copy old choices.Best regards,
Krzysztof
Quoted 14 lines
Krzysztof Kozlowski (12):
ARM: dts: exynos: adjust node names to DT spec in Exynos3250 boards
ARM: dts: exynos: adjust node names to DT spec in Exynos4210 boards
ARM: dts: exynos: override GPIO keys node by label in Exynos4412
Odroid family
ARM: dts: exynos: adjust node names to DT spec in Exynos4412 boards
ARM: dts: exynos: remove redundant status=okay in Exynos4412 boards
ARM: dts: exynos: adjust node names to DT spec in Exynos5250 boards
ARM: dts: exynos: adjust node names to DT spec in Odroid XU
ARM: dts: exynos: adjust node names to DT spec in Exynos542x boards
ARM: dts: s5pv210: adjust node names to DT spec
arm64: dts: exynos: adjust node names to DT spec in Exynos5433 TM2
arm64: dts: exynos: adjust node names to DT spec in Exynos7 Espresso
arm64: dts: exynos: remove redundant status=okay in Exynos5433 TM2
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel