Skip to content

Commit f01b326

Browse files
arndbarndb
committed
Merge tag 'mvebu-dt-6.11-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt for 6.11 (part 1) armada-385: Add 7-segment LED display on x530 armada-385: Add Turris Omnia MCU related node armada-370 irqchip DT changes: Drop #size-cells from mpic node orion / kirkwood: few cleanups * tag 'mvebu-dt-6.11-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: ARM: dts: turris-omnia: Add GPIO key node for front button ARM: dts: turris-omnia: Add MCU system-controller node ARM: dts: marvell: orion: align LED node name with bindings ARM: dts: marvell: orion5x-lswsgl: use 'gpios' property for LEDs ARM: dts: marvell: orion: drop incorrect address/size-cells in GPIO keys ARM: dts: marvell: orion: align GPIO keys node name with bindings ARM: dts: marvell: kirkwood: align LED node name with bindings ARM: dts: marvell: kirkwood: drop incorrect address/size-cells in GPIO keys ARM: dts: marvell: kirkwood: align GPIO keys node name with bindings ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node ARM: dts: marvell: Add 7-segment LED display on x530 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents b4f8192 + 731daaa commit f01b326

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+242
-279
lines changed

‎arch/arm/boot/dts/marvell/armada-385-atl-x530.dts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@
4343
};
4444
};
4545
};
46+
47+
led-7seg {
48+
compatible = "gpio-7-segment";
49+
segment-gpios = <&led_7seg_gpio 0 GPIO_ACTIVE_LOW>,
50+
<&led_7seg_gpio 1 GPIO_ACTIVE_LOW>,
51+
<&led_7seg_gpio 2 GPIO_ACTIVE_LOW>,
52+
<&led_7seg_gpio 3 GPIO_ACTIVE_LOW>,
53+
<&led_7seg_gpio 4 GPIO_ACTIVE_LOW>,
54+
<&led_7seg_gpio 5 GPIO_ACTIVE_LOW>,
55+
<&led_7seg_gpio 6 GPIO_ACTIVE_LOW>;
56+
};
4657
};
4758

4859
&pciec {
@@ -149,7 +160,7 @@
149160
#size-cells = <0>;
150161
reg = <3>;
151162

152-
gpio@20 {
163+
led_7seg_gpio: gpio@20 {
153164
compatible = "nxp,pca9554";
154165
gpio-controller;
155166
#gpio-cells = <2>;

‎arch/arm/boot/dts/marvell/kirkwood-blackarmor-nas220.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
gpio_keys {
3636
compatible = "gpio-keys";
3737

38-
reset {
38+
button-reset {
3939
label = "Reset";
4040
linux,code = <KEY_POWER>;
4141
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
4242
};
4343

44-
button {
44+
button-power {
4545
label = "Power";
4646
linux,code = <KEY_SLEEP>;
4747
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
@@ -51,7 +51,7 @@
5151
gpio-leds {
5252
compatible = "gpio-leds";
5353

54-
blue-power {
54+
led-blue-power {
5555
label = "nas220:blue:power";
5656
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
5757
linux,default-trigger = "default-on";

‎arch/arm/boot/dts/marvell/kirkwood-c200-v1.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@
2929
pinctrl-0 = <&pmx_buttons>;
3030
pinctrl-names = "default";
3131

32-
power {
32+
button-power {
3333
label = "Power Button";
3434
linux,code = <KEY_POWER>;
3535
gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
3636
};
3737

38-
reset {
38+
button-reset {
3939
label = "Reset Button";
4040
linux,code = <KEY_RESTART>;
4141
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
4242
};
4343

44-
usb1 {
44+
button-usb1 {
4545
label = "USB1 Button";
4646
linux,code = <BTN_0>;
4747
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
4848
};
4949

50-
usb2 {
50+
button-usb2 {
5151
label = "USB2 Button";
5252
linux,code = <BTN_1>;
5353
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;

‎arch/arm/boot/dts/marvell/kirkwood-cloudbox.dts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@
5858

5959
gpio_keys {
6060
compatible = "gpio-keys";
61-
#address-cells = <1>;
62-
#size-cells = <0>;
6361

64-
power {
62+
key-power {
6563
label = "Power push button";
6664
linux,code = <KEY_POWER>;
6765
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
@@ -71,11 +69,11 @@
7169
gpio-leds {
7270
compatible = "gpio-leds";
7371

74-
red-fail {
72+
led-red-fail {
7573
label = "cloudbox:red:fail";
7674
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
7775
};
78-
blue-sata {
76+
led-blue-sata {
7977
label = "cloudbox:blue:sata";
8078
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
8179
};

‎arch/arm/boot/dts/marvell/kirkwood-d2net.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
gpio-leds {
3838
compatible = "gpio-leds";
3939

40-
red-fail {
40+
led-red-fail {
4141
label = "d2net_v2:red:fail";
4242
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
4343
};

‎arch/arm/boot/dts/marvell/kirkwood-dir665.dts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,54 +137,52 @@
137137
gpio-leds {
138138
compatible = "gpio-leds";
139139

140-
blue-usb {
140+
led-blue-usb {
141141
label = "dir665:blue:usb";
142142
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
143143
};
144-
blue-internet {
144+
led-blue-internet {
145145
/* Can only be turned on if the Internet
146146
* Ethernet port has Link
147147
*/
148148
label = "dir665:blue:internet";
149149
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
150150
};
151-
amber-internet {
151+
led-amber-internet {
152152
label = "dir665:amber:internet";
153153
gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
154154
};
155-
blue-wifi5g {
155+
led-blue-wifi5g {
156156
label = "dir665:blue:5g";
157157
gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
158158
};
159-
blue-status {
159+
led-blue-status {
160160
label = "dir665:blue:status";
161161
gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
162162
};
163-
blue-wps {
163+
led-blue-wps {
164164
label = "dir665:blue:wps";
165165
gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
166166
};
167-
amber-status {
167+
led-amber-status {
168168
label = "dir665:amber:status";
169169
gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
170170
};
171-
blue-24g {
171+
led-blue-24g {
172172
label = "dir665:blue:24g";
173173
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
174174
};
175175
};
176176

177177
gpio-keys {
178178
compatible = "gpio-keys";
179-
#address-cells = <1>;
180-
#size-cells = <0>;
181179

182-
reset {
180+
button-reset {
183181
label = "reset";
184182
linux,code = <KEY_RESTART>;
185183
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
186184
};
187-
wps {
185+
button-wps {
188186
label = "wps";
189187
linux,code = <KEY_WPS_BUTTON>;
190188
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

‎arch/arm/boot/dts/marvell/kirkwood-dns320.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@
2424
&pmx_led_white_usb>;
2525
pinctrl-names = "default";
2626

27-
blue-power {
27+
led-blue-power {
2828
label = "dns320:blue:power";
2929
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
3030
default-state = "keep";
3131
};
32-
blue-usb {
32+
led-blue-usb {
3333
label = "dns320:blue:usb";
3434
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
3535
};
36-
orange-l_hdd {
36+
led-orange-l_hdd {
3737
label = "dns320:orange:l_hdd";
3838
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
3939
};
40-
orange-r_hdd {
40+
led-orange-r_hdd {
4141
label = "dns320:orange:r_hdd";
4242
gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
4343
};
44-
orange-usb {
44+
led-orange-usb {
4545
label = "dns320:orange:usb";
4646
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; /* GPIO 35 */
4747
};

‎arch/arm/boot/dts/marvell/kirkwood-dns325.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@
2424
&pmx_led_white_usb>;
2525
pinctrl-names = "default";
2626

27-
white-power {
27+
led-white-power {
2828
label = "dns325:white:power";
2929
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
3030
default-state = "keep";
3131
};
32-
white-usb {
32+
led-white-usb {
3333
label = "dns325:white:usb";
3434
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* GPIO 43 */
3535
};
36-
red-l_hdd {
36+
led-red-l_hdd {
3737
label = "dns325:red:l_hdd";
3838
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
3939
};
40-
red-r_hdd {
40+
led-red-r_hdd {
4141
label = "dns325:red:r_hdd";
4242
gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
4343
};
44-
red-usb {
44+
led-red-usb {
4545
label = "dns325:red:usb";
4646
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
4747
};

‎arch/arm/boot/dts/marvell/kirkwood-dnskw.dtsi

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,21 @@
88

99
gpio_keys {
1010
compatible = "gpio-keys";
11-
#address-cells = <1>;
12-
#size-cells = <0>;
1311
pinctrl-0 = <&pmx_button_power &pmx_button_unmount
1412
&pmx_button_reset>;
1513
pinctrl-names = "default";
1614

17-
power {
15+
button-power {
1816
label = "Power button";
1917
linux,code = <KEY_POWER>;
2018
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
2119
};
22-
eject {
20+
button-eject {
2321
label = "USB unmount button";
2422
linux,code = <KEY_EJECTCD>;
2523
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
2624
};
27-
reset {
25+
button-reset {
2826
label = "Reset button";
2927
linux,code = <KEY_RESTART>;
3028
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

‎arch/arm/boot/dts/marvell/kirkwood-dockstar.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
4343
pinctrl-names = "default";
4444

45-
health {
45+
led-health {
4646
label = "status:green:health";
4747
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
4848
default-state = "keep";
4949
};
50-
fault {
50+
led-fault {
5151
label = "status:orange:fault";
5252
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
5353
};

0 commit comments

Comments
 (0)