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-stamp9g20.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-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 = { | |||
85 | .rdy_pin = AT91_PIN_PC13, | 85 | .rdy_pin = AT91_PIN_PC13, |
86 | .enable_pin = AT91_PIN_PC14, | 86 | .enable_pin = AT91_PIN_PC14, |
87 | .bus_width_16 = 0, | 87 | .bus_width_16 = 0, |
88 | .det_pin = -EINVAL, | ||
88 | }; | 89 | }; |
89 | 90 | ||
90 | static struct sam9_smc_config __initdata nand_smc_config = { | 91 | static struct sam9_smc_config __initdata nand_smc_config = { |
@@ -122,12 +123,17 @@ static void __init add_device_nand(void) | |||
122 | static struct mci_platform_data __initdata mmc_data = { | 123 | static struct mci_platform_data __initdata mmc_data = { |
123 | .slot[0] = { | 124 | .slot[0] = { |
124 | .bus_width = 4, | 125 | .bus_width = 4, |
126 | .detect_pin = -1; | ||
127 | .wp_pin = -1; | ||
125 | }, | 128 | }, |
126 | }; | 129 | }; |
127 | #else | 130 | #else |
128 | static struct at91_mmc_data __initdata mmc_data = { | 131 | static struct at91_mmc_data __initdata mmc_data = { |
129 | .slot_b = 0, | 132 | .slot_b = 0, |
130 | .wire4 = 1, | 133 | .wire4 = 1, |
134 | .det_pin = -EINVAL, | ||
135 | .wp_pin = -EINVAL, | ||
136 | .vcc_pin = -EINVAL, | ||
131 | }; | 137 | }; |
132 | #endif | 138 | #endif |
133 | 139 | ||
@@ -137,6 +143,8 @@ static struct at91_mmc_data __initdata mmc_data = { | |||
137 | */ | 143 | */ |
138 | static struct at91_usbh_data __initdata usbh_data = { | 144 | static struct at91_usbh_data __initdata usbh_data = { |
139 | .ports = 2, | 145 | .ports = 2, |
146 | .vbus_pin = {-EINVAL, -EINVAL}, | ||
147 | .overcurrent_pin= {-EINVAL, -EINVAL}, | ||
140 | }; | 148 | }; |
141 | 149 | ||
142 | 150 | ||
@@ -145,12 +153,12 @@ static struct at91_usbh_data __initdata usbh_data = { | |||
145 | */ | 153 | */ |
146 | static struct at91_udc_data __initdata portuxg20_udc_data = { | 154 | static struct at91_udc_data __initdata portuxg20_udc_data = { |
147 | .vbus_pin = AT91_PIN_PC7, | 155 | .vbus_pin = AT91_PIN_PC7, |
148 | .pullup_pin = 0, /* pull-up driven by UDC */ | 156 | .pullup_pin = -EINVAL, /* pull-up driven by UDC */ |
149 | }; | 157 | }; |
150 | 158 | ||
151 | static struct at91_udc_data __initdata stamp9g20evb_udc_data = { | 159 | static struct at91_udc_data __initdata stamp9g20evb_udc_data = { |
152 | .vbus_pin = AT91_PIN_PA22, | 160 | .vbus_pin = AT91_PIN_PA22, |
153 | .pullup_pin = 0, /* pull-up driven by UDC */ | 161 | .pullup_pin = -EINVAL, /* pull-up driven by UDC */ |
154 | }; | 162 | }; |
155 | 163 | ||
156 | 164 | ||