Skip to contentSkip to conversation

ARM: kirkwood: Convert the mplcec4 board to pinctrl

PATCH New Stefan Peter 2 participants 3 messages Nov 19, 2012

Subsystems (3)
Device tree bindings Arm (32-bit) Arm sub-architectures
lore
Share & tools
lore

Stefan Peter

author
#0 lore raw

v2 cover ARM: kirkwood: Convert the mplcec4 board to pinctrl

This patch converts the mplcec4 board to using the pinctrl patches.

Changes from V1
* moved sdio pinctrl definitions from mplcec4.dts to kirkwood-6281.dtsi for usage by other boards
* fixed a typo in the sdio pinctrl definitions (/s/mmp13/mpp13/)

Stefan Peter (1):
Convert mplcec4 board to pinctrl

 arch/arm/boot/dts/kirkwood-6281.dtsi   |    7 +++-
 arch/arm/boot/dts/kirkwood-mplcec4.dts |   59 ++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-mplcec4.c |   35 -------------------
 3 files changed, 65 insertions(+), 36 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 1/1 ARM: kirkwood: Convert mplcec4 board to pinctrl

Signed-off-by Stefan Peter <[email protected]>

---

arch/arm/boot/dts/kirkwood-6281.dtsi +6 -1
index b0fe682..d6c9d65 100644
@@ -34,6 +34,11 @@
 				marvell,pins = "mpp13", "mpp14";
 				marvell,function = "uart1";
 			};
+			pmx_sdio: pmx-sdio {
+				marvell,pins = "mpp12", "mpp13", "mpp14",
+					       "mpp15", "mpp16", "mpp17";
+				marvell,function = "sdio";
+			};
 		};
 	};
-};
\ No newline at end of file
+};
arch/arm/boot/dts/kirkwood-mplcec4.dts +59 -0

71 lines not on this page · raw message

arch/arm/mach-kirkwood/board-mplcec4.c +0 -35
index e78a227..47e7181 100644
@@ -24,51 +24,16 @@ static struct mv643xx_eth_platform_data mplcec4_ge01_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(2),
 };
 
-static unsigned int mplcec4_mpp_config[] __initdata = {
-	MPP0_NF_IO2,
-	MPP1_NF_IO3,
-	MPP2_NF_IO4,
-	MPP3_NF_IO5,
-	MPP4_NF_IO6,
-	MPP5_NF_IO7,
-	MPP6_SYSRST_OUTn,
-	MPP7_GPO,	/* Status LED Green High Active */
-	MPP10_UART0_TXD,
-	MPP11_UART0_RXD,
-	MPP12_SD_CLK,
-	MPP13_SD_CMD,	/* Alt UART1_TXD */
-	MPP14_SD_D0,	/* Alt UART1_RXD */
-	MPP15_SD_D1,
-	MPP16_SD_D2,
-	MPP17_SD_D3,
-	MPP18_NF_IO0,
-	MPP19_NF_IO1,
-	MPP28_GPIO,	/* Input SYS_POR_DET (active High) */
-	MPP29_GPIO,	/* Input SYS_RTC_INT (active High) */
-	MPP34_SATA1_ACTn,
-	MPP35_SATA0_ACTn,
-	MPP40_GPIO,	/* LED User1 orange */
-	MPP41_GPIO,	/* LED User1 green */
-	MPP44_GPIO,	/* LED User0 orange */
-	MPP45_GPIO,	/* LED User0 green */
-	MPP46_GPIO,	/* Status LED Yellow High Active */
-	MPP47_GPIO,	/* SD_CD# (in/IRQ)*/
-	0
-};
-
-
 static struct mvsdio_platform_data mplcec4_mvsdio_data = {
 	.gpio_card_detect = 47,	/* MPP47 used as SD card detect */
 };
 
 
-
 void __init mplcec4_init(void)
 {
 	/*
 	 * Basic setup. Needs to be called early.
 	 */
-	kirkwood_mpp_conf(mplcec4_mpp_config);
 	kirkwood_ehci_init();
 	kirkwood_ge00_init(&mplcec4_ge00_data);
 	kirkwood_ge01_init(&mplcec4_ge01_data);
Signature · 1 line
1.7.9.5
#2 lore raw

v2 cover ARM: kirkwood: Convert the mplcec4 board to pinctrl

In reply to Stefan Peter
Quoted 7 lines · Stefan Peter

This patch converts the mplcec4 board to using the pinctrl patches.

Changes from V1
* moved sdio pinctrl definitions from mplcec4.dts to kirkwood-6281.dtsi for usage by other boards
* fixed a typo in the sdio pinctrl definitions (/s/mmp13/mpp13/)

Quoted 7 lines

Stefan Peter (1):
Convert mplcec4 board to pinctrl

 arch/arm/boot/dts/kirkwood-6281.dtsi   |    7 +++-
 arch/arm/boot/dts/kirkwood-mplcec4.dts |   59 ++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/board-mplcec4.c |   35 -------------------
 3 files changed, 65 insertions(+), 36 deletions(-)
Acked-by Andrew Lunn <[email protected]>

Andrewy