mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-15 20:12:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'dt-cleanup-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into arm/dt

Browse Source 
Minor improvements in ARM DTS for v6.3

1. Drop 0x from unit address (socpfga).
2. Align HDMI CEC and LED nodes with bindings (stih410, keystone, dove,
   at91).

* tag 'dt-cleanup-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  ARM: dts: at91: align LED node names with dtschema
  ARM: dts: dove: align LED node names with dtschema
  ARM: dts: keystone: align LED node names with dtschema
  ARM: dts: stih410: align HDMI CEC node names with dtschema
  ARM: dts: socfpga: drop 0x from unit address

Link: https://lore.kernel.org/r/20230122121541.29312-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-01-25 17:00:47 +01:00
parent 6042a5880a 3a48b303d4
commit 4f848f23f5
22 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/at91-gatwick.dts
View File

@@ -31,37 +31,37 @@ reset-button {
leds {
compatible = "gpio-leds";
ethernet {
led-ethernet {
label = "gatwick:yellow:ethernet";
gpios = <&pioA 10 GPIO_ACTIVE_LOW>;
default-state = "off";
};
wifi {
led-wifi {
label = "gatwick:green:wifi";
gpios = <&pioA 28 GPIO_ACTIVE_LOW>;
default-state = "off";
};
ble {
led-ble {
label = "gatwick:blue:ble";
gpios = <&pioA 22 GPIO_ACTIVE_LOW>;
default-state = "off";
};
lora {
led-lora {
label = "gatwick:orange:lora";
gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
default-state = "off";
};
blank {
led-blank {
label = "gatwick:green:blank";
gpios = <&pioA 24 GPIO_ACTIVE_LOW>;
default-state = "off";
};
user {
led-user {
label = "gatwick:yellow:user";
gpios = <&pioA 12 GPIO_ACTIVE_LOW>;
default-state = "off";

6
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
View File

@@ -498,17 +498,17 @@ leds {
pinctrl-0 = <&pinctrl_led_gpio_default>;
status = "okay"; /* Conflict with pwm0. */
red {
led-red {
label = "red";
gpios = <&pioA PIN_PA10 GPIO_ACTIVE_HIGH>;
};
green {
led-green {
label = "green";
gpios = <&pioA PIN_PB1 GPIO_ACTIVE_HIGH>;
};
blue {
led-blue {
label = "blue";
gpios = <&pioA PIN_PA31 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";

6
arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
View File

@@ -46,17 +46,17 @@ leds {
pinctrl-0 = <&pinctrl_led_gpio_default>;
status = "okay";
red {
led-red {
label = "red";
gpios = <&pioA PIN_PA6 GPIO_ACTIVE_HIGH>;
};
green {
led-green {
label = "green";
gpios = <&pioA PIN_PA7 GPIO_ACTIVE_HIGH>;
};
blue {
led-blue {
label = "blue";
gpios = <&pioA PIN_PA8 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";

6
arch/arm/boot/dts/at91-sama5d2_icp.dts
View File

@@ -62,17 +62,17 @@ leds {
pinctrl-0 = <&pinctrl_led_gpio_default>;
status = "okay"; /* conflict with pwm0 */
red {
led-red {
label = "red";
gpios = <&pioA PIN_PB0 GPIO_ACTIVE_HIGH>;
};
green {
led-green {
label = "green";
gpios = <&pioA PIN_PB1 GPIO_ACTIVE_HIGH>;
};
blue {
led-blue {
label = "blue";
gpios = <&pioA PIN_PA31 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";

6
arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
View File

@@ -416,17 +416,17 @@ leds {
pinctrl-0 = <&pinctrl_led_gpio_default>;
status = "okay";
red {
led-red {
label = "red";
gpios = <&pioA PIN_PB10 GPIO_ACTIVE_HIGH>;
};
green {
led-green {
label = "green";
gpios = <&pioA PIN_PB8 GPIO_ACTIVE_HIGH>;
};
blue {
led-blue {
label = "blue";
gpios = <&pioA PIN_PB6 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";

6
arch/arm/boot/dts/at91-sama5d2_xplained.dts
View File

@@ -725,18 +725,18 @@ leds {
pinctrl-0 = <&pinctrl_led_gpio_default>;
status = "okay"; /* conflict with pwm0 */
red {
led-red {
label = "red";
gpios = <&pioA PIN_PB6 GPIO_ACTIVE_LOW>;
};
green {
led-green {
label = "green";
gpios = <&pioA PIN_PB5 GPIO_ACTIVE_LOW>;
};
blue {
led-blue {
label = "blue";
gpios = <&pioA PIN_PB0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat";

4
arch/arm/boot/dts/at91-sama5d3_xplained.dts
View File

@@ -392,13 +392,13 @@ leds {
pinctrl-0 = <&pinctrl_gpio_leds>;
status = "okay";
d2 {
led-d2 {
label = "d2";
gpios = <&pioE 23 GPIO_ACTIVE_LOW>; /* PE23, conflicts with A23, CTS2 */
linux,default-trigger = "heartbeat";
};
d3 {
led-d3 {
label = "d3"; /* Conflict with EBI CS0, USART2 CTS. */
gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
};

6
arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts
View File

@@ -115,19 +115,19 @@ leds {
compatible = "gpio-leds";
status = "okay";
user1 {
led-user1 {
label = "user1";
gpios = <&pioD 28 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
user2 {
led-user2 {
label = "user2";
gpios = <&pioD 29 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
user3 {
led-user3 {
label = "user3";
gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";

4
arch/arm/boot/dts/at91-sama5d4_xplained.dts
View File

@@ -262,13 +262,13 @@ leds {
pinctrl-0 = <&pinctrl_gpio_leds>;
status = "okay";
d8 {
led-d8 {
label = "d8";
gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
d10 {
led-d10 {
label = "d10";
gpios = <&pioE 15 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat";

6
arch/arm/boot/dts/at91-sama5d4ek.dts
View File

@@ -287,18 +287,18 @@ leds {
compatible = "gpio-leds";
status = "okay";
d8 {
led-d8 {
label = "d8";
/* PE28, conflicts with usart4 rts pin */
gpios = <&pioE 28 GPIO_ACTIVE_LOW>;
};
d9 {
led-d9 {
label = "d9";
gpios = <&pioE 9 GPIO_ACTIVE_HIGH>;
};
d10 {
led-d10 {
label = "d10";
gpios = <&pioE 8 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat";

16
arch/arm/boot/dts/at91-tse850-3.dts
View File

@@ -106,35 +106,35 @@ envelope-detector-mux {
leds {
compatible = "gpio-leds";
ch1-red {
led-ch1-red {
label = "ch-1:red";
gpios = <&pioA 23 GPIO_ACTIVE_LOW>;
};
ch1-green {
led-ch1-green {
label = "ch-1:green";
gpios = <&pioA 22 GPIO_ACTIVE_LOW>;
};
ch2-red {
led-ch2-red {
label = "ch-2:red";
gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
};
ch2-green {
led-ch2-green {
label = "ch-2:green";
gpios = <&pioA 20 GPIO_ACTIVE_LOW>;
};
data-red {
led-data-red {
label = "data:red";
gpios = <&pioA 19 GPIO_ACTIVE_LOW>;
};
data-green {
led-data-green {
label = "data:green";
gpios = <&pioA 18 GPIO_ACTIVE_LOW>;
};
alarm-red {
led-alarm-red {
label = "alarm:red";
gpios = <&pioA 17 GPIO_ACTIVE_LOW>;
};
alarm-green {
led-alarm-green {
label = "alarm:green";
gpios = <&pioA 16 GPIO_ACTIVE_LOW>;
};

2
arch/arm/boot/dts/dove-cm-a510.dtsi
View File

@@ -101,7 +101,7 @@ leds {
pinctrl-0 = <&pmx_nand_gpo>;
pinctrl-names = "default";
system {
led-system {
label = "cm-a510:system:green";
gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
default-state = "keep";

2
arch/arm/boot/dts/dove-cubox.dts
View File

@@ -21,7 +21,7 @@ leds {
pinctrl-0 = <&pmx_gpio_18>;
pinctrl-names = "default";
power {
led-power {
label = "Power";
gpios = <&gpio0 18 1>;
default-state = "keep";

6
arch/arm/boot/dts/dove-d2plug.dts
View File

@@ -21,17 +21,17 @@ leds {
pinctrl-0 = <&pmx_gpio_0 &pmx_gpio_1 &pmx_gpio_2>;
pinctrl-names = "default";
wlan-ap {
led-wlan-ap {
label = "wlan-ap";
gpios = <&gpio0 0 1>;
};
wlan-act {
led-wlan-act {
label = "wlan-act";
gpios = <&gpio0 1 1>;
};
bluetooth-act {
led-bluetooth-act {
label = "bt-act";
gpios = <&gpio0 2 1>;
};

6
arch/arm/boot/dts/dove-d3plug.dts
View File

@@ -21,17 +21,17 @@ leds {
pinctrl-0 = <&pmx_gpio_0 &pmx_gpio_1 &pmx_gpio_2>;
pinctrl-names = "default";
wlan-act {
led-wlan-act {
label = "wlan-act";
gpios = <&gpio0 0 1>;
};
wlan-ap {
led-wlan-ap {
label = "wlan-ap";
gpios = <&gpio0 1 1>;
};
status {
led-status {
label = "status";
gpios = <&gpio0 2 1>;
};

8
arch/arm/boot/dts/keystone-k2hk-evm.dts
View File

@@ -28,22 +28,22 @@ dsp_common_memory: dsp-common-memory@81f800000 {
leds {
compatible = "gpio-leds";
debug1_1 {
led-debug-1-1 {
label = "keystone:green:debug1";
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; /* 12 */
};
debug1_2 {
led-debug-1-2 {
label = "keystone:red:debug1";
gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; /* 13 */
};
debug2 {
led-debug-2 {
label = "keystone:blue:debug2";
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; /* 14 */
};
debug3 {
led-debug-3 {
label = "keystone:blue:debug3";
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; /* 15 */
};

2
arch/arm/boot/dts/sama5d31ek.dts
View File

@@ -40,7 +40,7 @@ macb1: ethernet@f802c000 {
};
leds {
d3 {
led-d3 {
label = "d3";
gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
};

2
arch/arm/boot/dts/sama5d34ek.dts
View File

@@ -50,7 +50,7 @@ macb0: ethernet@f0028000 {
};
leds {
d3 {
led-d3 {
label = "d3";
gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
};

2
arch/arm/boot/dts/sama5d3xcm.dtsi
View File

@@ -130,7 +130,7 @@ rootfs@800000 {
leds {
compatible = "gpio-leds";
d2 {
led-d2 {
label = "d2";
gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */
linux,default-trigger = "heartbeat";

2
arch/arm/boot/dts/sama5d3xcm_cmp.dtsi
View File

@@ -184,7 +184,7 @@ rootfs@800000 {
leds {
compatible = "gpio-leds";
d2 {
led-d2 {
label = "d2";
gpios = <&pioE 25 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat";

2
arch/arm/boot/dts/socfpga.dtsi
View File

@@ -749,7 +749,7 @@ L2: cache-controller@fffef000 {
arm,prefetch-offset = <7>;
};
l3regs@0xff800000 {
l3regs@ff800000 {
compatible = "altr,l3regs", "syscon";
reg = <0xff800000 0x1000>;
};

2
arch/arm/boot/dts/stih410.dtsi
View File

@@ -272,7 +272,7 @@ thermal@91a0000 {
interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;
};
sti-cec@94a087c {
cec@94a087c {
compatible = "st,stih-cec";
reg = <0x94a087c 0x64>;
clocks = <&clk_sysin>;