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

Commit d5b5746b authored by John Holland's avatar John Holland Committed by Nicolas Pitre
Browse files

[ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP 

Accept SD CD and SD WP in accordance to
http://plugcomputer.org/data/docs/Sheeva-PowerPlug-V1.3-GTI-090906.pdf


on MPP 47 and 44 respectively on the eSATA SheevaPlug

Signed-off-by: default avatarJohn Holland <john.holland@cellent-fs.de>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
--
parent d7b222d7

arch/arm/mach-kirkwood/sheevaplug-setup.c

+24 −2
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ static struct mvsdio_platform_data sheevaplug_mvsdio_data = { 
	/* unfortunately the CD signal has not been connected */

};



static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {

	.gpio_write_protect = 44, /* MPP44 used as SD write protect */

	.gpio_card_detect = 47,	  /* MPP47 used as SD card detect */

};



static struct gpio_led sheevaplug_led_pins[] = {

	{

		.name			= "plug:green:health",
@@ -79,12 +84,25 @@ static unsigned int sheevaplug_mpp_config[] __initdata = { 
	0

};



static unsigned int sheeva_esata_mpp_config[] __initdata = {

	MPP29_GPIO,	/* USB Power Enable */

	MPP44_GPIO,	/* SD Write Protect */

	MPP47_GPIO,	/* SD Card Detect */

	MPP49_GPIO,	/* LED Green */

	0

};



static void __init sheevaplug_init(void)

{

	/*

	 * Basic setup. Needs to be called early.

	 */

	kirkwood_init();



	/* setup gpio pin select */

	if (machine_is_sheeva_esata())

		kirkwood_mpp_conf(sheeva_esata_mpp_config);

	else

		kirkwood_mpp_conf(sheevaplug_mpp_config);



	kirkwood_uart0_init();
@@ -101,6 +119,10 @@ static void __init sheevaplug_init(void) 
	if (machine_is_sheeva_esata())

		kirkwood_sata_init(&sheeva_esata_sata_data);



	/* enable sd wp and sd cd on plugs with esata */

	if (machine_is_sheeva_esata())

		kirkwood_sdio_init(&sheeva_esata_mvsdio_data);

	else

		kirkwood_sdio_init(&sheevaplug_mvsdio_data);



	platform_device_register(&sheevaplug_leds);