summaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
authorJonas Larsson <jonas.larsson@martinsson.se>2009-03-31 11:16:52 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2009-04-08 20:48:02 +0200
commit7ebcfcf19723254ebe90cdf8718436b9955a9a01 (patch)
tree33951ec3f6a71c36e19645afcdc4c1c1eab577a8 /arch/avr32
parentatmel-mci: Add support for inverted detect pin (diff)
downloadlinux-7ebcfcf19723254ebe90cdf8718436b9955a9a01.tar.xz
linux-7ebcfcf19723254ebe90cdf8718436b9955a9a01.zip
avr32: Solves problem with inverted MCI detect pin on Merisc board
Same patch as before, modified to use bool. This patch solves the problem with the inverted mci detect pin on Merisc boards. Signed-off-by: Jonas Larsson <jonas.larsson@martinsson.se> Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/boards/merisc/setup.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index 20b300cf105a..623b077594fc 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -94,9 +94,10 @@ static struct spi_board_info __initdata spi0_board_info[] = {
static struct mci_platform_data __initdata mci0_data = {
.slot[0] = {
- .bus_width = 4,
- .detect_pin = GPIO_PIN_PE(19),
- .wp_pin = GPIO_PIN_PE(20),
+ .bus_width = 4,
+ .detect_pin = GPIO_PIN_PE(19),
+ .wp_pin = GPIO_PIN_PE(20),
+ .detect_is_active_high = true,
},
};