ARM: mvebu: Update the mpp63 function in the device tree on Armada 370

PATCH New Gregory CLEMENT 2 participants 6 messages Dec 23, 2015 – Jan 11, 2016

Subsystems (2)

Device tree bindings Pin control

lore

Share & tools

lore

Gregory CLEMENT

author

2015-12-23 14:42 UTC #0 lore raw

PATCH 1/1 ARM: mvebu: 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 <[email protected]>

---
 .../devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt       | 5 ++++-
 arch/arm/boot/dts/armada-370-mirabox.dts                             | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts                       | 2 +-
 arch/arm/boot/dts/armada-370-synology-ds213j.dts                     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

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

index add7c38ec7d8..8662f3aaf312 100644
@@ -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

index 3aa980ad64f0..d5e19cd4d256 100644
@@ -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

index faa474874cb8..11565752b9f6 100644
@@ -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

index 836bcc07afc5..8ca7a4340c0f 100644
@@ -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 {

Signature · 1 line

2.5.0

Jason Cooper

2015-12-23 14:57 UTC #1 lore raw

PATCH 1/1 ARM: mvebu: Update the mpp63 function in the device tree on Armada 370

Hey Gregory,

Quoted 5 lines · Gregory CLEMENT

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.

I think this is worth a comment in the binding doc to prevent confusion.

Quoted 19 lines

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 <[email protected]>
---
 .../devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt       | 5 ++++-
 arch/arm/boot/dts/armada-370-mirabox.dts                             | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts                       | 2 +-
 arch/arm/boot/dts/armada-370-synology-ds213j.dts                     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +0 -0
index add7c38ec7d8..8662f3aaf312 100644

Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout), · line 94

Quoted 5 lines

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

@@ -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

e.g.

mpp63 63 gpio, spi0(sck), tclk (datasheet incorrectly says gpo)

or similar.

thx,

Jason.

Quoted 47 lines

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

 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

index 3aa980ad64f0..d5e19cd4d256 100644
@@ -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

index faa474874cb8..11565752b9f6 100644
@@ -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

index 836bcc07afc5..8ca7a4340c0f 100644
@@ -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 {

Signature · 1 line

2.5.0

Gregory CLEMENT

author

2015-12-23 15:00 UTC #2 lore raw

PATCH 1/1 ARM: mvebu: Update the mpp63 function in the device tree on Armada 370

Hi Jason,

Quoted 46 lines · Jason Cooper

Hey Gregory,
Quoted 5 lines · Gregory CLEMENT
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.
I think this is worth a comment in the binding doc to prevent confusion.
Quoted 19 lines
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 <[email protected]>
---
 .../devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt       | 5 ++++-
 arch/arm/boot/dts/armada-370-mirabox.dts                             | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts                       | 2 +-
 arch/arm/boot/dts/armada-370-synology-ds213j.dts                     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +0 -0
index add7c38ec7d8..8662f3aaf312 100644
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout), · line 94
Quoted 5 lines
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +1 -1
@@ -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
e.g.
mpp63 63 gpio, spi0(sck), tclk (datasheet incorrectly says gpo)
or similar.
thx,
Jason.

Quoted 8 lines

Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout), · line 99
Quoted 8 lines
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +3 -0
 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

This is why I added this note, I thought it was enough.

Thanks,

Gregory

Signature · 4 lines

Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Jason Cooper

2015-12-23 15:11 UTC #3 lore raw

PATCH 1/1 ARM: mvebu: Update the mpp63 function in the device tree on Armada 370

Quoted 55 lines · Gregory CLEMENT

Hi Jason,
Quoted 48 lines · Jason Cooper
Hey Gregory,
Quoted 5 lines · Gregory CLEMENT
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.
I think this is worth a comment in the binding doc to prevent confusion.
Quoted 19 lines
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 <[email protected]>
---
 .../devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt       | 5 ++++-
 arch/arm/boot/dts/armada-370-mirabox.dts                             | 2 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts                       | 2 +-
 arch/arm/boot/dts/armada-370-synology-ds213j.dts                     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +0 -0
index add7c38ec7d8..8662f3aaf312 100644
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout), · line 94
Quoted 5 lines
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +1 -1
@@ -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
e.g.
mpp63 63 gpio, spi0(sck), tclk (datasheet incorrectly says gpo)
or similar.
thx,
Jason.
Quoted 2 lines
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +0 -0
 mpp64         64       gpio, spi0(miso), spi0(cs1)
 mpp65         65       gpio, spi0(mosi), spi0(cs2)

Quoted 4 lines

Quoted 3 lines
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout), · line 99
Quoted 3 lines
Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt +3 -0
+
+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
This is why I added this note, I thought it was enough.

doh! Completely missed that. My mistake.

thx,

Jason.

Jason Cooper

2015-12-23 15:12 UTC #4 lore raw

PATCH 1/1 ARM: mvebu: Update the mpp63 function in the device tree on Armada 370

In reply to Gregory CLEMENT

Quoted 6 lines · Gregory CLEMENT

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.

Quoted 7 lines

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 <[email protected]>

Acked-by Jason Cooper <[email protected]>

thx,

Jason.

Gregory CLEMENT

author Applied

2016-01-11 16:34 UTC #5 lore raw

PATCH 1/1 ARM: mvebu: Update the mpp63 function in the device tree on Armada 370

Hi,

Quoted 11 lines · Jason Cooper

Quoted 10 lines · Gregory CLEMENT
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.

Quoted 5 lines

Quoted 3 lines
The binding documentation has also been updated accordingly.
Signed-off-by Gregory CLEMENT <[email protected]>
Acked-by Jason Cooper <[email protected]>

Applied to mvebu/dt-for-4.6 with Jason Acked-by

Gregory

Quoted 4 lines

thx,
Jason.

Signature · 4 lines

Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com