diff options
| author | Jean-Christophe PLAGNIOL-VILLARD | 2011-11-24 18:51:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2011-11-29 16:46:14 +0100 |
| commit | 63b4c2967850033de0a488d2ba7cd09052199d99 (patch) | |
| tree | 86a21775f577fa5b7ea83ca81cfce1912d6cc29c /arch/arm/mach-at91/board-stamp9g20.c | |
| parent | ARM: at91: gpio make struct at91_gpio_bank an initdata (diff) | |
| download | kernel-qcow2-linux-63b4c2967850033de0a488d2ba7cd09052199d99.tar.gz kernel-qcow2-linux-63b4c2967850033de0a488d2ba7cd09052199d99.tar.xz kernel-qcow2-linux-63b4c2967850033de0a488d2ba7cd09052199d99.zip | |
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-stamp9g20.c')
| -rw-r--r-- | arch/arm/mach-at91/board-stamp9g20.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c index f4b9b6f2b594..e8d3d5b88244 100644 --- a/arch/arm/mach-at91/board-stamp9g20.c +++ b/arch/arm/mach-at91/board-stamp9g20.c @@ -85,6 +85,7 @@ static struct atmel_nand_data __initdata nand_data = { .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, .bus_width_16 = 0, + .det_pin = -EINVAL, }; static struct sam9_smc_config __initdata nand_smc_config = { @@ -122,12 +123,17 @@ static void __init add_device_nand(void) static struct mci_platform_data __initdata mmc_data = { .slot[0] = { .bus_width = 4, + .detect_pin = -1; + .wp_pin = -1; }, }; #else static struct at91_mmc_data __initdata mmc_data = { .slot_b = 0, .wire4 = 1, + .det_pin = -EINVAL, + .wp_pin = -EINVAL, + .vcc_pin = -EINVAL, }; #endif @@ -137,6 +143,8 @@ static struct at91_mmc_data __initdata mmc_data = { */ static struct at91_usbh_data __initdata usbh_data = { .ports = 2, + .vbus_pin = {-EINVAL, -EINVAL}, + .overcurrent_pin= {-EINVAL, -EINVAL}, }; @@ -145,12 +153,12 @@ static struct at91_usbh_data __initdata usbh_data = { */ static struct at91_udc_data __initdata portuxg20_udc_data = { .vbus_pin = AT91_PIN_PC7, - .pullup_pin = 0, /* pull-up driven by UDC */ + .pullup_pin = -EINVAL, /* pull-up driven by UDC */ }; static struct at91_udc_data __initdata stamp9g20evb_udc_data = { .vbus_pin = AT91_PIN_PA22, - .pullup_pin = 0, /* pull-up driven by UDC */ + .pullup_pin = -EINVAL, /* pull-up driven by UDC */ }; |