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-carmeva.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-carmeva.c')
-rw-r--r-- | arch/arm/mach-at91/board-carmeva.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c index 529b356cdb7d..59d9cf997537 100644 --- a/arch/arm/mach-at91/board-carmeva.c +++ b/arch/arm/mach-at91/board-carmeva.c | |||
@@ -64,6 +64,8 @@ static struct macb_platform_data __initdata carmeva_eth_data = { | |||
64 | 64 | ||
65 | static struct at91_usbh_data __initdata carmeva_usbh_data = { | 65 | static struct at91_usbh_data __initdata carmeva_usbh_data = { |
66 | .ports = 2, | 66 | .ports = 2, |
67 | .vbus_pin = {-EINVAL, -EINVAL}, | ||
68 | .overcurrent_pin= {-EINVAL, -EINVAL}, | ||
67 | }; | 69 | }; |
68 | 70 | ||
69 | static struct at91_udc_data __initdata carmeva_udc_data = { | 71 | static struct at91_udc_data __initdata carmeva_udc_data = { |
@@ -75,8 +77,8 @@ static struct at91_udc_data __initdata carmeva_udc_data = { | |||
75 | // static struct at91_cf_data __initdata carmeva_cf_data = { | 77 | // static struct at91_cf_data __initdata carmeva_cf_data = { |
76 | // .det_pin = AT91_PIN_PB0, | 78 | // .det_pin = AT91_PIN_PB0, |
77 | // .rst_pin = AT91_PIN_PC5, | 79 | // .rst_pin = AT91_PIN_PC5, |
78 | // .irq_pin = ... not connected | 80 | // .irq_pin = -EINVAL, |
79 | // .vcc_pin = ... always powered | 81 | // .vcc_pin = -EINVAL, |
80 | // }; | 82 | // }; |
81 | 83 | ||
82 | static struct at91_mmc_data __initdata carmeva_mmc_data = { | 84 | static struct at91_mmc_data __initdata carmeva_mmc_data = { |
@@ -84,6 +86,7 @@ static struct at91_mmc_data __initdata carmeva_mmc_data = { | |||
84 | .wire4 = 1, | 86 | .wire4 = 1, |
85 | .det_pin = AT91_PIN_PB10, | 87 | .det_pin = AT91_PIN_PB10, |
86 | .wp_pin = AT91_PIN_PC14, | 88 | .wp_pin = AT91_PIN_PC14, |
89 | .vcc_pin = -EINVAL, | ||
87 | }; | 90 | }; |
88 | 91 | ||
89 | static struct spi_board_info carmeva_spi_devices[] = { | 92 | static struct spi_board_info carmeva_spi_devices[] = { |