Skip to content

Commit 070d04f

Browse files
committed
Merge tag 'mvebu-fixes-6.15-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into arm/fixes
mvebu fixes for 6.15 (part 1) Fix uDPU board LEDs by correcting pinctrl state * tag 'mvebu-fixes-6.15-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: arm64: dts: marvell: uDPU: define pinctrl state for alarm LEDs Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 4e3d2c4 + b04f0d8 commit 070d04f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
leds {
2828
compatible = "gpio-leds";
29+
pinctrl-names = "default";
30+
pinctrl-0 = <&spi_quad_pins>;
2931

3032
led-power1 {
3133
label = "udpu:green:power";
@@ -82,8 +84,6 @@
8284

8385
&spi0 {
8486
status = "okay";
85-
pinctrl-names = "default";
86-
pinctrl-0 = <&spi_quad_pins>;
8787

8888
flash@0 {
8989
compatible = "jedec,spi-nor";
@@ -108,6 +108,10 @@
108108
};
109109
};
110110

111+
&spi_quad_pins {
112+
function = "gpio";
113+
};
114+
111115
&pinctrl_nb {
112116
i2c2_recovery_pins: i2c2-recovery-pins {
113117
groups = "i2c2";

0 commit comments

Comments
 (0)