Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Since the commit a526973e0291 ("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: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>

+7 -4
+4 -1
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
··· 91 91 mpp61 61 gpo, dev(we1), uart1(txd), audio(lrclk) 92 92 mpp62 62 gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0), 93 93 audio(mclk), uart0(cts) 94 - mpp63 63 gpo, spi0(sck), tclk 94 + mpp63 63 gpio, spi0(sck), tclk 95 95 mpp64 64 gpio, spi0(miso), spi0(cs1) 96 96 mpp65 65 gpio, spi0(mosi), spi0(cs2) 97 + 98 + Note: According to the datasheet mpp63 is a gpo but there is at least 99 + one example of a gpio usage on the board D-Link DNS-327L
+1 -1
arch/arm/boot/dts/armada-370-mirabox.dts
··· 200 200 &pinctrl { 201 201 pwr_led_pin: pwr-led-pin { 202 202 marvell,pins = "mpp63"; 203 - marvell,function = "gpo"; 203 + marvell,function = "gpio"; 204 204 }; 205 205 206 206 stat_led_pins: stat-led-pins {
+1 -1
arch/arm/boot/dts/armada-370-netgear-rn104.dts
··· 297 297 298 298 backup_led_pin: backup-led-pin { 299 299 marvell,pins = "mpp63"; 300 - marvell,function = "gpo"; 300 + marvell,function = "gpio"; 301 301 }; 302 302 303 303 power_led_pin: power-led-pin {
+1 -1
arch/arm/boot/dts/armada-370-synology-ds213j.dts
··· 339 339 340 340 fan_ctrl_high_pin: fan-ctrl-high-pin { 341 341 marvell,pins = "mpp63"; 342 - marvell,function = "gpo"; 342 + marvell,function = "gpio"; 343 343 }; 344 344 345 345 fan_alarm_pin: fan-alarm-pin {