ARM: Kirkwood: Convert GoFlex Net to pinctrl.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Joshua Coombs <josh.coombs@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Andrew Lunn 2012-11-17 17:00:51 +01:00 committed by Jason Cooper
parent 56942287be
commit 5d183ef910
2 changed files with 56 additions and 18 deletions

View File

@ -1,6 +1,7 @@
/dts-v1/;
/include/ "kirkwood.dtsi"
/include/ "kirkwood-6281.dtsi"
/ {
model = "Seagate GoFlex Net";
@ -16,6 +17,61 @@ chosen {
};
ocp@f1000000 {
pinctrl: pinctrl@10000 {
pinctrl-0 = < &pmx_usb_power_enable &pmx_led_orange
&pmx_led_left_cap_0 &pmx_led_left_cap_1
&pmx_led_left_cap_2 &pmx_led_left_cap_3
&pmx_led_right_cap_0 &pmx_led_right_cap_1
&pmx_led_right_cap_2 &pmx_led_right_cap_3
>;
pinctrl-names = "default";
pmx_usb_power_enable: pmx-usb-power-enable {
marvell,pins = "mpp29";
marvell,function = "gpio";
};
pmx_led_right_cap_0: pmx-led_right_cap_0 {
marvell,pins = "mpp38";
marvell,function = "gpio";
};
pmx_led_right_cap_1: pmx-led_right_cap_1 {
marvell,pins = "mpp39";
marvell,function = "gpio";
};
pmx_led_right_cap_2: pmx-led_right_cap_2 {
marvell,pins = "mpp40";
marvell,function = "gpio";
};
pmx_led_right_cap_3: pmx-led_right_cap_3 {
marvell,pins = "mpp41";
marvell,function = "gpio";
};
pmx_led_left_cap_0: pmx-led_left_cap_0 {
marvell,pins = "mpp42";
marvell,function = "gpio";
};
pmx_led_left_cap_1: pmx-led_left_cap_1 {
marvell,pins = "mpp43";
marvell,function = "gpio";
};
pmx_led_left_cap_2: pmx-led_left_cap_2 {
marvell,pins = "mpp44";
marvell,function = "gpio";
};
pmx_led_left_cap_3: pmx-led_left_cap_3 {
marvell,pins = "mpp45";
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";

View File

@ -33,33 +33,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 goflexnet_ge00_data = {
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
};
static unsigned int goflexnet_mpp_config[] __initdata = {
MPP29_GPIO, /* USB Power Enable */
MPP47_GPIO, /* LED Orange */
MPP46_GPIO, /* LED Green */
MPP45_GPIO, /* LED Left Capacity 3 */
MPP44_GPIO, /* LED Left Capacity 2 */
MPP43_GPIO, /* LED Left Capacity 1 */
MPP42_GPIO, /* LED Left Capacity 0 */
MPP41_GPIO, /* LED Right Capacity 3 */
MPP40_GPIO, /* LED Right Capacity 2 */
MPP39_GPIO, /* LED Right Capacity 1 */
MPP38_GPIO, /* LED Right Capacity 0 */
0
};
void __init goflexnet_init(void)
{
/*
* Basic setup. Needs to be called early.
*/
kirkwood_mpp_conf(goflexnet_mpp_config);
kirkwood_ge00_init(&goflexnet_ge00_data);
}