Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ARM: Kirkwood: Convert dockstar to pinctrl. 



Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent f83065fa

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

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

/dts-v1/;





/include/ "kirkwood.dtsi"

/include/ "kirkwood.dtsi"

/include/ "kirkwood-6281.dtsi"





/ {

/ {

	model = "Seagate FreeAgent Dockstar";

	model = "Seagate FreeAgent Dockstar";
@@ -16,6 +17,25 @@ 
	};

	};





	ocp@f1000000 {

	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 {

		serial@12000 {

			clock-frequency = <200000000>;

			clock-frequency = <200000000>;

			status = "ok";

			status = "ok";

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

+0 −10
Original line number Original line Diff line number Diff line
@@ -31,25 +31,15 @@ 
#include <mach/bridge-regs.h>

#include <mach/bridge-regs.h>

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

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

#include "common.h"

#include "common.h"

#include "mpp.h"





static struct mv643xx_eth_platform_data dockstar_ge00_data = {

static struct mv643xx_eth_platform_data dockstar_ge00_data = {

	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),

	.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)

void __init dockstar_dt_init(void)

{

{

	/*

	/*

	 * Basic setup. Needs to be called early.

	 * Basic setup. Needs to be called early.

	 */

	 */

	kirkwood_mpp_conf(dockstar_mpp_config);



	kirkwood_ge00_init(&dockstar_ge00_data);

	kirkwood_ge00_init(&dockstar_ge00_data);

}
 
}