ARM: dts: armada388-helios4: assign pinctrl to each fan

[ Upstream commit 46ecdfc1830eaa40a11d7f832089c82b0e67ea96 ]

Split up the pins for each fan. This is needed in order to control them

Fixes: ced8025b569e ("ARM: dts: armada388-helios4")
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
index 5a6af7e83e44551369259451eb69f6a24d302f89..ec134e22bae3e41e779fad36e6d52a6b86986dec 100644 (file)
--- a/arch/arm/boot/dts/armada-388-helios4.dts
+++ b/arch/arm/boot/dts/armada-388-helios4.dts
@@ -127,11 +127,15 @@
        fan1: j10-pwm {
                compatible = "pwm-fan";
                pwms = <&gpio1 9 40000>;        /* Target freq:25 kHz */
+               pinctrl-names = "default";
+               pinctrl-0 = <&helios_fan1_pins>;
        };
 
        fan2: j17-pwm {
                compatible = "pwm-fan";
                pwms = <&gpio1 23 40000>;       /* Target freq:25 kHz */
+               pinctrl-names = "default";
+               pinctrl-0 = <&helios_fan2_pins>;
        };
 
        usb2_phy: usb2-phy {
@@ -302,9 +306,12 @@
                                                       "mpp54";
                                        marvell,function = "gpio";
                                };
-                               helios_fan_pins: helios-fan-pins {
-                                       marvell,pins = "mpp41", "mpp43",
-                                                      "mpp48", "mpp55";
+                               helios_fan1_pins: helios_fan1_pins {
+                                       marvell,pins = "mpp41", "mpp43";
+                                       marvell,function = "gpio";
+                               };
+                               helios_fan2_pins: helios_fan2_pins {
+                                       marvell,pins = "mpp48", "mpp55";
                                        marvell,function = "gpio";
                                };
                                microsom_spi1_cs_pins: spi1-cs-pins {