ARM: dts: armada-370: Update the mpp63 function in the device tree on Armada 370
authorGregory CLEMENT <gregory.clement@free-electrons.com>
Wed, 23 Dec 2015 14:29:17 +0000 (15:29 +0100)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Tue, 9 Feb 2016 10:00:16 +0000 (11:00 +0100)
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>
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt
arch/arm/boot/dts/armada-370-mirabox.dts
arch/arm/boot/dts/armada-370-netgear-rn104.dts
arch/arm/boot/dts/armada-370-synology-ds213j.dts

index add7c38ec7d888b958df828139c1847ddc61c7e4..8662f3aaf312d9484a8e74373a5971a47d6b908a 100644 (file)
@@ -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
index 3aa980ad64f0c47f7603d5144ffa04211578b2e1..d5e19cd4d256bc1e8fd51b21201ca576278ee782 100644 (file)
 &pinctrl {
        pwr_led_pin: pwr-led-pin {
                marvell,pins = "mpp63";
-               marvell,function = "gpo";
+               marvell,function = "gpio";
        };
 
        stat_led_pins: stat-led-pins {
index faa474874cb8e5c4436154cf6dcbf38f7daa60ef..11565752b9f6b7f83ea56187ebcac73deaf91a36 100644 (file)
 
        backup_led_pin: backup-led-pin {
                marvell,pins = "mpp63";
-               marvell,function = "gpo";
+               marvell,function = "gpio";
        };
 
        power_led_pin: power-led-pin {
index 836bcc07afc5babe199baaea184b3149d6020dbd..8ca7a4340c0ff8301a80b1d6e75b52770cfdeebd 100644 (file)
 
        fan_ctrl_high_pin: fan-ctrl-high-pin {
                marvell,pins = "mpp63";
-               marvell,function = "gpo";
+               marvell,function = "gpio";
        };
 
        fan_alarm_pin: fan-alarm-pin {