summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/openrd-setup.c
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-03-23 13:56:58 +0100
committerJason Cooper <jason@lakedaemon.net>2013-03-28 16:56:31 +0000
commit0d0644ebc63bce3784ebea28d0355071b4e90525 (patch)
tree260bb5aa3ed8f594cf00faefcf54e2cdec9375c1 /arch/arm/mach-kirkwood/openrd-setup.c
parent7f23f62fc31c5c97947414c0937a72e08a947a41 (diff)
downloadlinux-0d0644ebc63bce3784ebea28d0355071b4e90525.tar.gz
linux-0d0644ebc63bce3784ebea28d0355071b4e90525.tar.bz2
linux-0d0644ebc63bce3784ebea28d0355071b4e90525.zip
ARM: Kirkwood: fix unused mvsdio gpio pins
mvsdio_platform_data allows to pass card detect and write protect gpio numbers to the driver. Some kirkwood boards don't use both pins as they are not connected, and don't set the corresponding value in platform_data. This will leave the unset values in platform_data initialized as 0, which is in fact a valid gpio pin. mvsdio will grab that pin and configure it as gpio, which in turn breaks nand controller as mpp0 also carries nand_io2. This patch fixes the above by initializing unused gpio functions in the platform_data with an invalid (-1) value. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Reported-by: Soeren Moch <smoch@web.de> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/openrd-setup.c')
-rw-r--r--arch/arm/mach-kirkwood/openrd-setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 8ddd69fdc937..6a6eb548307d 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -55,6 +55,7 @@ static struct mv_sata_platform_data openrd_sata_data = {
static struct mvsdio_platform_data openrd_mvsdio_data = {
.gpio_card_detect = 29, /* MPP29 used as SD card detect */
+ .gpio_write_protect = -1,
};
static unsigned int openrd_mpp_config[] __initdata = {