Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce5cad51 authored by Gregory CLEMENT's avatar Gregory CLEMENT
Browse files

ARM: dts: armada-370: Update the mpp63 function in the device tree on Armada 370 



Since the commit a526973e ("pinctrl: mvebu: Fix mapping of pin
63 (gpo -> gpio)"), the mpp63 is no more declared as a GPO but is a
GPIO. Even if in the datasheet this pin is described as GPO, the
experience of the D-Link DNS-327L board shows that it can be used as a
GPIO.

This commits generated warnings for the board using this pin as gpo, with
this patch the dts are fixed by using the new function (gpio) instead of
the old one.

The binding documentation has also been updated accordingly.

Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 96c78e2b

Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt

+4 −1
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout), 
mpp61         61       gpo, dev(we1), uart1(txd), audio(lrclk)

mpp62         62       gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),

                       audio(mclk), uart0(cts)

mpp63         63       gpo, spi0(sck), tclk

mpp63         63       gpio, spi0(sck), tclk

mpp64         64       gpio, spi0(miso), spi0(cs1)

mpp65         65       gpio, spi0(mosi), spi0(cs2)



Note: According to the datasheet mpp63 is a gpo but there is at least

one example of a gpio usage on the board D-Link DNS-327L

arch/arm/boot/dts/armada-370-mirabox.dts

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 
&pinctrl {

	pwr_led_pin: pwr-led-pin {

		marvell,pins = "mpp63";

		marvell,function = "gpo";

		marvell,function = "gpio";

	};



	stat_led_pins: stat-led-pins {

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ 


	backup_led_pin: backup-led-pin {

		marvell,pins = "mpp63";

		marvell,function = "gpo";

		marvell,function = "gpio";

	};



	power_led_pin: power-led-pin {

arch/arm/boot/dts/armada-370-synology-ds213j.dts

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ 


	fan_ctrl_high_pin: fan-ctrl-high-pin {

		marvell,pins = "mpp63";

		marvell,function = "gpo";

		marvell,function = "gpio";

	};



	fan_alarm_pin: fan-alarm-pin {