From 94a343a4ba611a60625239f14ad2aa9c5e694dc3 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Sat, 17 Nov 2012 17:00:49 +0100
Subject: [PATCH] --- yaml --- r: 342350 b: refs/heads/master c:
 1bf370a827175665d9b0e591a99243de0f6bb4e3 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/boot/dts/kirkwood-dockstar.dts | 20 +++++++++++++++++++
 trunk/arch/arm/mach-kirkwood/board-dockstar.c | 10 ----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index c7d63b2420ec..3e8b0f526c3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f83065fa43c19600752a380f6d861b787a30d905
+refs/heads/master: 1bf370a827175665d9b0e591a99243de0f6bb4e3
diff --git a/trunk/arch/arm/boot/dts/kirkwood-dockstar.dts b/trunk/arch/arm/boot/dts/kirkwood-dockstar.dts
index c0fbfdc342f8..2e3dd34e21a5 100644
--- a/trunk/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/trunk/arch/arm/boot/dts/kirkwood-dockstar.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 
 /include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
 
 / {
 	model = "Seagate FreeAgent Dockstar";
@@ -16,6 +17,25 @@
 	};
 
 	ocp@f1000000 {
+		pinctrl: pinctrl@10000 {
+
+			pinctrl-0 = < &pmx_usb_power_enable
+				      &pmx_led_green &pmx_led_orange >;
+			pinctrl-names = "default";
+
+			pmx_usb_power_enable: pmx-usb-power-enable {
+				marvell,pins = "mpp29";
+				marvell,function = "gpio";
+			};
+			pmx_led_green: pmx-led-green {
+				marvell,pins = "mpp46";
+				marvell,function = "gpio";
+			};
+			pmx_led_orange: pmx-led-orange {
+				marvell,pins = "mpp47";
+				marvell,function = "gpio";
+			};
+		};
 		serial@12000 {
 			clock-frequency = <200000000>;
 			status = "ok";
diff --git a/trunk/arch/arm/mach-kirkwood/board-dockstar.c b/trunk/arch/arm/mach-kirkwood/board-dockstar.c
index 410452acf323..726cfc4b8921 100644
--- a/trunk/arch/arm/mach-kirkwood/board-dockstar.c
+++ b/trunk/arch/arm/mach-kirkwood/board-dockstar.c
@@ -31,25 +31,15 @@
 #include <mach/bridge-regs.h>
 #include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
-#include "mpp.h"
 
 static struct mv643xx_eth_platform_data dockstar_ge00_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
 };
 
-static unsigned int dockstar_mpp_config[] __initdata = {
-	MPP29_GPIO,	/* USB Power Enable */
-	MPP46_GPIO,	/* LED green */
-	MPP47_GPIO,	/* LED orange */
-	0
-};
-
 void __init dockstar_dt_init(void)
 {
 	/*
 	 * Basic setup. Needs to be called early.
 	 */
-	kirkwood_mpp_conf(dockstar_mpp_config);
-
 	kirkwood_ge00_init(&dockstar_ge00_data);
 }