Skip to content

Commit

Permalink
ARM: Kirkwood: fix unused mvsdio gpio pins
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sebastian Hesselbarth authored and Jason Cooper committed Mar 28, 2013
1 parent 7f23f62 commit 0d0644e
Showing 3 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-kirkwood/guruplug-setup.c
Original file line number Diff line number Diff line change
@@ -53,6 +53,8 @@ static struct mv_sata_platform_data guruplug_sata_data = {

static struct mvsdio_platform_data guruplug_mvsdio_data = {
/* unfortunately the CD signal has not been connected */
.gpio_card_detect = -1,
.gpio_write_protect = -1,
};

static struct gpio_led guruplug_led_pins[] = {
1 change: 1 addition & 0 deletions arch/arm/mach-kirkwood/openrd-setup.c
Original file line number Diff line number Diff line change
@@ -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 = {
1 change: 1 addition & 0 deletions arch/arm/mach-kirkwood/rd88f6281-setup.c
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ static struct mv_sata_platform_data rd88f6281_sata_data = {

static struct mvsdio_platform_data rd88f6281_mvsdio_data = {
.gpio_card_detect = 28,
.gpio_write_protect = -1,
};

static unsigned int rd88f6281_mpp_config[] __initdata = {

0 comments on commit 0d0644e

Please sign in to comment.