Commit 56942287 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Kirkwood: Convert dreamplug to pinctrl. 



Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 1bf370a8

arch/arm/boot/dts/kirkwood-dreamplug.dts

+21 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"

/include/ "kirkwood-6281.dtsi"



/ {

	model = "Globalscale Technologies Dreamplug";
@@ -16,6 +17,26 @@ 
	};



	ocp@f1000000 {

		pinctrl: pinctrl@10000 {



			pinctrl-0 = < &pmx_spi

				      &pmx_led_bluetooth &pmx_led_wifi

				      &pmx_led_wifi_ap >;

			pinctrl-names = "default";



			pmx_led_bluetooth: pmx-led-bluetooth {

				marvell,pins = "mpp47";

				marvell,function = "gpio";

			};

			pmx_led_wifi: pmx-led-wifi {

				marvell,pins = "mpp48";

				marvell,function = "gpio";

			};

			pmx_led_wifi_ap: pmx-led-wifi-ap {

				marvell,pins = "mpp49";

				marvell,function = "gpio";

			};

		};

		serial@12000 {

			clock-frequency = <200000000>;

			status = "ok";

arch/arm/mach-kirkwood/board-dreamplug.c

+0 −14
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <mach/bridge-regs.h>

#include <linux/platform_data/mmc-mvsdio.h>

#include "common.h"

#include "mpp.h"



static struct mv643xx_eth_platform_data dreamplug_ge00_data = {

	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
@@ -46,24 +45,11 @@ static struct mvsdio_platform_data dreamplug_mvsdio_data = { 
	/* unfortunately the CD signal has not been connected */

};



static unsigned int dreamplug_mpp_config[] __initdata = {

	MPP0_SPI_SCn,

	MPP1_SPI_MOSI,

	MPP2_SPI_SCK,

	MPP3_SPI_MISO,

	MPP47_GPIO,	/* Bluetooth LED */

	MPP48_GPIO,	/* Wifi LED */

	MPP49_GPIO,	/* Wifi AP LED */

	0

};



void __init dreamplug_init(void)

{

	/*

	 * Basic setup. Needs to be called early.

	 */

	kirkwood_mpp_conf(dreamplug_mpp_config);



	kirkwood_ge00_init(&dreamplug_ge00_data);

	kirkwood_ge01_init(&dreamplug_ge01_data);

	kirkwood_sdio_init(&dreamplug_mvsdio_data);