diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-11-24 12:51:06 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 10:46:14 -0500 |
commit | 63b4c2967850033de0a488d2ba7cd09052199d99 (patch) | |
tree | 86a21775f577fa5b7ea83ca81cfce1912d6cc29c /arch/arm/mach-at91/board-sam9g20ek.c | |
parent | 1a2d9156b5fc92b40aa2ffbc2fdf6d88bbf74f3a (diff) |
ARM: at91/boards: use -EINVAL for invalid gpio
this will allow to use gpio_is_valid
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/board-sam9g20ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index a67b269a2fce..843d6286c6f4 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
@@ -86,6 +86,8 @@ static void __init ek_init_early(void) | |||
86 | */ | 86 | */ |
87 | static struct at91_usbh_data __initdata ek_usbh_data = { | 87 | static struct at91_usbh_data __initdata ek_usbh_data = { |
88 | .ports = 2, | 88 | .ports = 2, |
89 | .vbus_pin = {-EINVAL, -EINVAL}, | ||
90 | .overcurrent_pin= {-EINVAL, -EINVAL}, | ||
89 | }; | 91 | }; |
90 | 92 | ||
91 | /* | 93 | /* |
@@ -93,7 +95,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = { | |||
93 | */ | 95 | */ |
94 | static struct at91_udc_data __initdata ek_udc_data = { | 96 | static struct at91_udc_data __initdata ek_udc_data = { |
95 | .vbus_pin = AT91_PIN_PC5, | 97 | .vbus_pin = AT91_PIN_PC5, |
96 | .pullup_pin = 0, /* pull-up driven by UDC */ | 98 | .pullup_pin = -EINVAL, /* pull-up driven by UDC */ |
97 | }; | 99 | }; |
98 | 100 | ||
99 | 101 | ||
@@ -163,6 +165,7 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
163 | .cle = 22, | 165 | .cle = 22, |
164 | .rdy_pin = AT91_PIN_PC13, | 166 | .rdy_pin = AT91_PIN_PC13, |
165 | .enable_pin = AT91_PIN_PC14, | 167 | .enable_pin = AT91_PIN_PC14, |
168 | .det_pin = -EINVAL, | ||
166 | .parts = ek_nand_partition, | 169 | .parts = ek_nand_partition, |
167 | .num_parts = ARRAY_SIZE(ek_nand_partition), | 170 | .num_parts = ARRAY_SIZE(ek_nand_partition), |
168 | }; | 171 | }; |
@@ -210,6 +213,7 @@ static struct mci_platform_data __initdata ek_mmc_data = { | |||
210 | .slot[1] = { | 213 | .slot[1] = { |
211 | .bus_width = 4, | 214 | .bus_width = 4, |
212 | .detect_pin = AT91_PIN_PC9, | 215 | .detect_pin = AT91_PIN_PC9, |
216 | .wp_pin = -EINVAL, | ||
213 | }, | 217 | }, |
214 | 218 | ||
215 | }; | 219 | }; |
@@ -218,6 +222,8 @@ static struct at91_mmc_data __initdata ek_mmc_data = { | |||
218 | .slot_b = 1, /* Only one slot so use slot B */ | 222 | .slot_b = 1, /* Only one slot so use slot B */ |
219 | .wire4 = 1, | 223 | .wire4 = 1, |
220 | .det_pin = AT91_PIN_PC9, | 224 | .det_pin = AT91_PIN_PC9, |
225 | .wp_pin = -EINVAL, | ||
226 | .vcc_pin = -EINVAL, | ||
221 | }; | 227 | }; |
222 | #endif | 228 | #endif |
223 | 229 | ||
@@ -227,6 +233,7 @@ static void __init ek_add_device_mmc(void) | |||
227 | if (ek_have_2mmc()) { | 233 | if (ek_have_2mmc()) { |
228 | ek_mmc_data.slot[0].bus_width = 4; | 234 | ek_mmc_data.slot[0].bus_width = 4; |
229 | ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2; | 235 | ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2; |
236 | ek_mmc_data.slot[0].wp_pin = -1; | ||
230 | } | 237 | } |
231 | at91_add_device_mci(0, &ek_mmc_data); | 238 | at91_add_device_mci(0, &ek_mmc_data); |
232 | #else | 239 | #else |