74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
From: John Holland <john.holland@cellent-fs.de>
|
|
Date: Fri, 19 Feb 2010 22:11:04 +0000 (+0100)
|
|
Subject: [ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d5b5746bed1023e4a55f96405422d3e51968fa43
|
|
|
|
[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: John Holland <john.holland@cellent-fs.de>
|
|
Signed-off-by: Nicolas Pitre <nico@marvell.com>
|
|
--
|
|
---
|
|
|
|
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
index bb9bc70..a00879d 100644
|
|
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
|
@@ -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,13 +84,26 @@ 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();
|
|
- kirkwood_mpp_conf(sheevaplug_mpp_config);
|
|
+
|
|
+ /* 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();
|
|
kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25);
|
|
@@ -101,7 +119,11 @@ static void __init sheevaplug_init(void)
|
|
if (machine_is_sheeva_esata())
|
|
kirkwood_sata_init(&sheeva_esata_sata_data);
|
|
|
|
- kirkwood_sdio_init(&sheevaplug_mvsdio_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);
|
|
}
|