Skip to contentSkip to conversation

ARM: Kirkwood: convert ns2 boards to pinctrl

PATCH New Simon Guinot 4 participants 13 messages Jan 8, 2013 – Jan 10, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Note that the pinctrl conversion also fixes GPIO support for ns2 boards. Since commit f9e75922: "ARM: Kirkwood: Make use of mvebu pincltl and gpio", the mvbu_gpio driver is used for DT boards. As mvbu_gpio relies on the pinctrl driver, then a pinctrl definition must be given to allow the GPIO configuration.

---
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi |   16 ++++++++++++
 arch/arm/mach-kirkwood/board-ns2.c         |   38 ----------------------------
 2 files changed, 16 insertions(+), 38 deletions(-)
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +16 -0
index 9bc6785..77d21ab 100644
@@ -1,4 +1,5 @@
 /include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
 
 / {
 	chosen {
@@ -6,6 +7,21 @@
 	};
 
 	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0
+					&pmx_ns2_sata0 &pmx_ns2_sata1>;
+			pinctrl-names = "default";
+
+			pmx_ns2_sata0: pmx-ns2-sata0 {
+				marvell,pins = "mpp21";
+				marvell,function = "sata0";
+			};
+			pmx_ns2_sata1: pmx-ns2-sata1 {
+				marvell,pins = "mpp20";
+				marvell,function = "sata1";
+			};
+		};
+
 		serial at 12000 {
 			clock-frequency = <166666667>;
 			status = "okay";
arch/arm/mach-kirkwood/board-ns2.c +0 -38
index 8821720..f4632a8 100644
@@ -18,47 +18,11 @@
 #include <linux/gpio.h>
 #include <linux/of.h>
 #include "common.h"
-#include "mpp.h"
 
 static struct mv643xx_eth_platform_data ns2_ge00_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
 };
 
-static unsigned int ns2_mpp_config[] __initdata = {
-	MPP0_SPI_SCn,
-	MPP1_SPI_MOSI,
-	MPP2_SPI_SCK,
-	MPP3_SPI_MISO,
-	MPP4_NF_IO6,
-	MPP5_NF_IO7,
-	MPP6_SYSRST_OUTn,
-	MPP7_GPO,		/* Fan speed (bit 1) */
-	MPP8_TW0_SDA,
-	MPP9_TW0_SCK,
-	MPP10_UART0_TXD,
-	MPP11_UART0_RXD,
-	MPP12_GPO,		/* Red led */
-	MPP14_GPIO,		/* USB fuse */
-	MPP16_GPIO,		/* SATA 0 power */
-	MPP17_GPIO,		/* SATA 1 power */
-	MPP18_NF_IO0,
-	MPP19_NF_IO1,
-	MPP20_SATA1_ACTn,
-	MPP21_SATA0_ACTn,
-	MPP22_GPIO,		/* Fan speed (bit 0) */
-	MPP23_GPIO,		/* Fan power */
-	MPP24_GPIO,		/* USB mode select */
-	MPP25_GPIO,		/* Fan rotation fail */
-	MPP26_GPIO,		/* USB device vbus */
-	MPP28_GPIO,		/* USB enable host vbus */
-	MPP29_GPIO,		/* Blue led (slow register) */
-	MPP30_GPIO,		/* Blue led (command register) */
-	MPP31_GPIO,		/* Board power off */
-	MPP32_GPIO,		/* Power button (0 = Released, 1 = Pushed) */
-	MPP33_GPO,		/* Fan speed (bit 2) */
-	0
-};
-
 #define NS2_GPIO_POWER_OFF	31
 
 static void ns2_power_off(void)
@@ -71,8 +35,6 @@ void __init ns2_init(void)
 	/*
 	 * Basic setup. Needs to be called early.
 	 */
-	kirkwood_mpp_conf(ns2_mpp_config);
-
 	if (of_machine_is_compatible("lacie,netspace_lite_v2") ||
 	    of_machine_is_compatible("lacie,netspace_mini_v2"))
 		ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
Signature · 1 line
1.7.10
#1 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 30 lines · Simon Guinot

Note that the pinctrl conversion also fixes GPIO support for ns2 boards. Since commit f9e75922: "ARM: Kirkwood: Make use of mvebu pincltl and gpio", the mvbu_gpio driver is used for DT boards. As mvbu_gpio relies on the pinctrl driver, then a pinctrl definition must be given to allow the GPIO configuration.

---
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi |   16 ++++++++++++
 arch/arm/mach-kirkwood/board-ns2.c         |   38 ----------------------------
 2 files changed, 16 insertions(+), 38 deletions(-)
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +5 -0
index 9bc6785..77d21ab 100644
@@ -1,4 +1,5 @@
 /include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
 
 / {
 	chosen {
@@ -6,6 +7,21 @@
 	};
 
 	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0
+					&pmx_ns2_sata0 &pmx_ns2_sata1>;
+			pinctrl-names = "default";

arch/arm/boot/dts/kirkwood-ns2-common.dtsi line 23

Quoted 10 lines
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +10 -0
+
+			pmx_ns2_sata0: pmx-ns2-sata0 {
+				marvell,pins = "mpp21";
+				marvell,function = "sata0";
+			};
+			pmx_ns2_sata1: pmx-ns2-sata1 {
+				marvell,pins = "mpp20";
+				marvell,function = "sata1";
+			};
+		};

Hi Simon

Its normal to also list all the gpio pins here as well.

Andrew

#2 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 44 lines · Andrew Lunn
Quoted 30 lines · Simon Guinot

Note that the pinctrl conversion also fixes GPIO support for ns2 boards. Since commit f9e75922: "ARM: Kirkwood: Make use of mvebu pincltl and gpio", the mvbu_gpio driver is used for DT boards. As mvbu_gpio relies on the pinctrl driver, then a pinctrl definition must be given to allow the GPIO configuration.

---
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi |   16 ++++++++++++
 arch/arm/mach-kirkwood/board-ns2.c         |   38 ----------------------------
 2 files changed, 16 insertions(+), 38 deletions(-)
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +5 -0
index 9bc6785..77d21ab 100644
@@ -1,4 +1,5 @@
 /include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
 
 / {
 	chosen {
@@ -6,6 +7,21 @@
 	};
 
 	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0
+					&pmx_ns2_sata0 &pmx_ns2_sata1>;
+			pinctrl-names = "default";

arch/arm/boot/dts/kirkwood-ns2-common.dtsi line 23

Quoted 10 lines
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +10 -0
+
+			pmx_ns2_sata0: pmx-ns2-sata0 {
+				marvell,pins = "mpp21";
+				marvell,function = "sata0";
+			};
+			pmx_ns2_sata1: pmx-ns2-sata1 {
+				marvell,pins = "mpp20";
+				marvell,function = "sata1";
+			};
+		};

Hi Simon

Quoted 1 line

Its normal to also list all the gpio pins here as well.

I was not sure about that. As gpio_request triggers the mpp configuration at run time, IMHO there is no point for an initial and statical configuration, except for a documentation purpose. As GPIOs are also referenced in their dedicated driver nodes, I think that the informations about the pin are quite exhaustive. All the non-GPIO MPPs are listed in the pinctrl node. The other MPPs are GPIOs if requested by a driver. It is simple :)

Do you think that the full MPP/GPIO list is really needed ?

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130108/5c06e391/attachment-0001.sig>

#3 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 45 lines · Simon Guinot
Quoted 44 lines · Andrew Lunn
Quoted 30 lines · Simon Guinot

Note that the pinctrl conversion also fixes GPIO support for ns2 boards. Since commit f9e75922: "ARM: Kirkwood: Make use of mvebu pincltl and gpio", the mvbu_gpio driver is used for DT boards. As mvbu_gpio relies on the pinctrl driver, then a pinctrl definition must be given to allow the GPIO configuration.

---
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi |   16 ++++++++++++
 arch/arm/mach-kirkwood/board-ns2.c         |   38 ----------------------------
 2 files changed, 16 insertions(+), 38 deletions(-)
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +5 -0
index 9bc6785..77d21ab 100644
@@ -1,4 +1,5 @@
 /include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
 
 / {
 	chosen {
@@ -6,6 +7,21 @@
 	};
 
 	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0
+					&pmx_ns2_sata0 &pmx_ns2_sata1>;
+			pinctrl-names = "default";

arch/arm/boot/dts/kirkwood-ns2-common.dtsi line 23

Quoted 10 lines
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +10 -0
+
+			pmx_ns2_sata0: pmx-ns2-sata0 {
+				marvell,pins = "mpp21";
+				marvell,function = "sata0";
+			};
+			pmx_ns2_sata1: pmx-ns2-sata1 {
+				marvell,pins = "mpp20";
+				marvell,function = "sata1";
+			};
+		};

Hi Simon

Quoted 5 lines
Quoted 1 line

Its normal to also list all the gpio pins here as well.

I was not sure about that. As gpio_request triggers the mpp configuration at run time, IMHO there is no point for an initial and statical configuration, except for a documentation purpose.

[Goes away and reads Docunmentation/gpio.txt]

Yes, you appear to be correct. Its not necessary. Don't know that.

Andrew

#4 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Dear Andrew Lunn,

Quoted 7 lines · Andrew Lunn
Quoted 3 lines

I was not sure about that. As gpio_request triggers the mpp configuration at run time, IMHO there is no point for an initial and statical configuration, except for a documentation purpose.

[Goes away and reads Docunmentation/gpio.txt]

Yes, you appear to be correct. Its not necessary. Don't know that.

Yes, Simon is correct.

gpio_request()
-> gpio/gpio-mvebu.c:mvebu_gpio_request()

    -> pinctrl/core.c:pinctrl_request_gpio()
      -> pinctrl/pinmux.c:pinmux_request_gpio()
        -> pinctrl/pinmux.c:pin_request()
          -> pinctrl/mvebu/pinctrl-mvebu.c:mvebu_pinmux_gpio_request_enable()
            -> which muxes the pin as GPIO

Pffiou :-)

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#5 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

In reply to Simon Guinot
Quoted 108 lines · Simon Guinot

Note that the pinctrl conversion also fixes GPIO support for ns2 boards. Since commit f9e75922: "ARM: Kirkwood: Make use of mvebu pincltl and gpio", the mvbu_gpio driver is used for DT boards. As mvbu_gpio relies on the pinctrl driver, then a pinctrl definition must be given to allow the GPIO configuration.

---
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi |   16 ++++++++++++
 arch/arm/mach-kirkwood/board-ns2.c         |   38 ----------------------------
 2 files changed, 16 insertions(+), 38 deletions(-)
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +16 -0
index 9bc6785..77d21ab 100644
@@ -1,4 +1,5 @@
 /include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
 
 / {
 	chosen {
@@ -6,6 +7,21 @@
 	};
 
 	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0
+					&pmx_ns2_sata0 &pmx_ns2_sata1>;
+			pinctrl-names = "default";
+
+			pmx_ns2_sata0: pmx-ns2-sata0 {
+				marvell,pins = "mpp21";
+				marvell,function = "sata0";
+			};
+			pmx_ns2_sata1: pmx-ns2-sata1 {
+				marvell,pins = "mpp20";
+				marvell,function = "sata1";
+			};
+		};
+
 		serial at 12000 {
 			clock-frequency = <166666667>;
 			status = "okay";
arch/arm/mach-kirkwood/board-ns2.c +0 -38
index 8821720..f4632a8 100644
@@ -18,47 +18,11 @@
 #include <linux/gpio.h>
 #include <linux/of.h>
 #include "common.h"
-#include "mpp.h"
 
 static struct mv643xx_eth_platform_data ns2_ge00_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
 };
 
-static unsigned int ns2_mpp_config[] __initdata = {
-	MPP0_SPI_SCn,
-	MPP1_SPI_MOSI,
-	MPP2_SPI_SCK,
-	MPP3_SPI_MISO,
-	MPP4_NF_IO6,
-	MPP5_NF_IO7,
-	MPP6_SYSRST_OUTn,
-	MPP7_GPO,		/* Fan speed (bit 1) */
-	MPP8_TW0_SDA,
-	MPP9_TW0_SCK,
-	MPP10_UART0_TXD,
-	MPP11_UART0_RXD,
-	MPP12_GPO,		/* Red led */
-	MPP14_GPIO,		/* USB fuse */
-	MPP16_GPIO,		/* SATA 0 power */
-	MPP17_GPIO,		/* SATA 1 power */
-	MPP18_NF_IO0,
-	MPP19_NF_IO1,
-	MPP20_SATA1_ACTn,
-	MPP21_SATA0_ACTn,
-	MPP22_GPIO,		/* Fan speed (bit 0) */
-	MPP23_GPIO,		/* Fan power */
-	MPP24_GPIO,		/* USB mode select */
-	MPP25_GPIO,		/* Fan rotation fail */
-	MPP26_GPIO,		/* USB device vbus */
-	MPP28_GPIO,		/* USB enable host vbus */
-	MPP29_GPIO,		/* Blue led (slow register) */
-	MPP30_GPIO,		/* Blue led (command register) */
-	MPP31_GPIO,		/* Board power off */
-	MPP32_GPIO,		/* Power button (0 = Released, 1 = Pushed) */
-	MPP33_GPO,		/* Fan speed (bit 2) */
-	0
-};
-
 #define NS2_GPIO_POWER_OFF	31
 
 static void ns2_power_off(void)
@@ -71,8 +35,6 @@ void __init ns2_init(void)
 	/*
 	 * Basic setup. Needs to be called early.
 	 */
-	kirkwood_mpp_conf(ns2_mpp_config);
-
 	if (of_machine_is_compatible("lacie,netspace_lite_v2") ||
 	    of_machine_is_compatible("lacie,netspace_mini_v2"))
 		ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
Signature · 1 line
1.7.10

Andrew

#6 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 96 lines · Andrew Lunn
Quoted 95 lines · Simon Guinot

Note that the pinctrl conversion also fixes GPIO support for ns2 boards. Since commit f9e75922: "ARM: Kirkwood: Make use of mvebu pincltl and gpio", the mvbu_gpio driver is used for DT boards. As mvbu_gpio relies on the pinctrl driver, then a pinctrl definition must be given to allow the GPIO configuration.

---
 arch/arm/boot/dts/kirkwood-ns2-common.dtsi |   16 ++++++++++++
 arch/arm/mach-kirkwood/board-ns2.c         |   38 ----------------------------
 2 files changed, 16 insertions(+), 38 deletions(-)
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +16 -0
index 9bc6785..77d21ab 100644
@@ -1,4 +1,5 @@
 /include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
 
 / {
 	chosen {
@@ -6,6 +7,21 @@
 	};
 
 	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0
+					&pmx_ns2_sata0 &pmx_ns2_sata1>;
+			pinctrl-names = "default";
+
+			pmx_ns2_sata0: pmx-ns2-sata0 {
+				marvell,pins = "mpp21";
+				marvell,function = "sata0";
+			};
+			pmx_ns2_sata1: pmx-ns2-sata1 {
+				marvell,pins = "mpp20";
+				marvell,function = "sata1";
+			};
+		};
+
 		serial at 12000 {
 			clock-frequency = <166666667>;
 			status = "okay";
arch/arm/mach-kirkwood/board-ns2.c +0 -36
index 8821720..f4632a8 100644
@@ -18,47 +18,11 @@
 #include <linux/gpio.h>
 #include <linux/of.h>
 #include "common.h"
-#include "mpp.h"
 
 static struct mv643xx_eth_platform_data ns2_ge00_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
 };
 
-static unsigned int ns2_mpp_config[] __initdata = {
-	MPP0_SPI_SCn,
-	MPP1_SPI_MOSI,
-	MPP2_SPI_SCK,
-	MPP3_SPI_MISO,
-	MPP4_NF_IO6,
-	MPP5_NF_IO7,
-	MPP6_SYSRST_OUTn,
-	MPP7_GPO,		/* Fan speed (bit 1) */
-	MPP8_TW0_SDA,
-	MPP9_TW0_SCK,
-	MPP10_UART0_TXD,
-	MPP11_UART0_RXD,
-	MPP12_GPO,		/* Red led */
-	MPP14_GPIO,		/* USB fuse */
-	MPP16_GPIO,		/* SATA 0 power */
-	MPP17_GPIO,		/* SATA 1 power */
-	MPP18_NF_IO0,
-	MPP19_NF_IO1,
-	MPP20_SATA1_ACTn,
-	MPP21_SATA0_ACTn,
-	MPP22_GPIO,		/* Fan speed (bit 0) */
-	MPP23_GPIO,		/* Fan power */
-	MPP24_GPIO,		/* USB mode select */
-	MPP25_GPIO,		/* Fan rotation fail */
-	MPP26_GPIO,		/* USB device vbus */
-	MPP28_GPIO,		/* USB enable host vbus */
-	MPP29_GPIO,		/* Blue led (slow register) */
-	MPP30_GPIO,		/* Blue led (command register) */
-	MPP31_GPIO,		/* Board power off */
-	MPP32_GPIO,		/* Power button (0 = Released, 1 = Pushed) */
-	MPP33_GPO,		/* Fan speed (bit 2) */
-	0
-};
-
 #define NS2_GPIO_POWER_OFF	31
 
Quoted 16 lines
Quoted 13 lines
arch/arm/mach-kirkwood/board-ns2.c +0 -2
 static void ns2_power_off(void)
@@ -71,8 +35,6 @@ void __init ns2_init(void)
 	/*
 	 * Basic setup. Needs to be called early.
 	 */
-	kirkwood_mpp_conf(ns2_mpp_config);
-
 	if (of_machine_is_compatible("lacie,netspace_lite_v2") ||
 	    of_machine_is_compatible("lacie,netspace_mini_v2"))
 		ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
Signature · 1 line
1.7.10

Do you think it is still possible to merge this patch as a bug fix for the current release ?

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130108/62ac5237/attachment.sig>

#7 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 2 lines

Do you think it is still possible to merge this patch as a bug fix for the current release ?

Hi Simon

The commit log will need some explanation why this is a fix. It currently looks like it just a conversion. Document what actually goes wrong and how this fixes it.

Andrew

#8 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 8 lines · Andrew Lunn
Quoted 2 lines

Do you think it is still possible to merge this patch as a bug fix for the current release ?

Hi Simon

The commit log will need some explanation why this is a fix. It currently looks like it just a conversion. Document what actually goes wrong and how this fixes it.

hmm, I could change the patch subject to:

-ARM: Kirkwood: convert ns2 boards to pinctrl +ARM: Kirkwood: fix gpio by converting ns2 boards to pinctrl

That's basically what the body says. Sound good?

thx,

Jason.

#9 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 15 lines · Jason Cooper
Quoted 8 lines · Andrew Lunn
Quoted 2 lines

Do you think it is still possible to merge this patch as a bug fix for the current release ?

Hi Simon

The commit log will need some explanation why this is a fix. It currently looks like it just a conversion. Document what actually goes wrong and how this fixes it.

hmm, I could change the patch subject to:

(quoted diff) +1 -1
-ARM: Kirkwood: convert ns2 boards to pinctrl
+ARM: Kirkwood: fix gpio by converting ns2 boards to pinctrl
Quoted 1 line

That's basically what the body says. Sound good?

It would be perfect for me.

Thanks.

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130108/85c75115/attachment.sig>

#10 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 11 lines · Simon Guinot
Quoted 10 lines · Jason Cooper
Quoted 8 lines · Andrew Lunn
Quoted 2 lines

Do you think it is still possible to merge this patch as a bug fix for the current release ?

Hi Simon

The commit log will need some explanation why this is a fix. It currently looks like it just a conversion. Document what actually goes wrong and how this fixes it.

Quoted 9 lines
Quoted 6 lines

hmm, I could change the patch subject to:

(quoted diff) +1 -1
-ARM: Kirkwood: convert ns2 boards to pinctrl
+ARM: Kirkwood: fix gpio by converting ns2 boards to pinctrl

That's basically what the body says. Sound good?

It would be perfect for me.

On second thought, I'll do "fix ns2 gpios by converting to pinctrl"

thx,

Jason.

#11 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

Quoted 17 lines · Jason Cooper
Quoted 16 lines · Simon Guinot
Quoted 15 lines · Jason Cooper
Quoted 8 lines · Andrew Lunn
Quoted 2 lines

Do you think it is still possible to merge this patch as a bug fix for the current release ?

Hi Simon

The commit log will need some explanation why this is a fix. It currently looks like it just a conversion. Document what actually goes wrong and how this fixes it.

hmm, I could change the patch subject to:

(quoted diff) +1 -1
-ARM: Kirkwood: convert ns2 boards to pinctrl
+ARM: Kirkwood: fix gpio by converting ns2 boards to pinctrl
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

That's basically what the body says. Sound good?

It would be perfect for me.

On second thought, I'll do "fix ns2 gpios by converting to pinctrl"

OK, thanks.

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130108/95db0972/attachment.sig>

Applied
#12 lore raw

PATCH 1/1 ARM: Kirkwood: convert ns2 boards to pinctrl

In reply to Simon Guinot
Quoted 7 lines · Simon Guinot

Note that the pinctrl conversion also fixes GPIO support for ns2 boards. Since commit f9e75922: "ARM: Kirkwood: Make use of mvebu pincltl and gpio", the mvbu_gpio driver is used for DT boards. As mvbu_gpio relies on the pinctrl driver, then a pinctrl definition must be given to allow the GPIO configuration.

Applied to mvebu/fixes with the following subject:

ARM: Kirkwood: fix ns2 gpios by converting to pinctrl

thx,

Jason.