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-afeb-9260v1.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-afeb-9260v1.c')
-rw-r--r-- | arch/arm/mach-at91/board-afeb-9260v1.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c index 17fc77925707..3bb40694b02d 100644 --- a/arch/arm/mach-at91/board-afeb-9260v1.c +++ b/arch/arm/mach-at91/board-afeb-9260v1.c | |||
@@ -75,6 +75,8 @@ static void __init afeb9260_init_early(void) | |||
75 | */ | 75 | */ |
76 | static struct at91_usbh_data __initdata afeb9260_usbh_data = { | 76 | static struct at91_usbh_data __initdata afeb9260_usbh_data = { |
77 | .ports = 1, | 77 | .ports = 1, |
78 | .vbus_pin = {-EINVAL, -EINVAL}, | ||
79 | .overcurrent_pin= {-EINVAL, -EINVAL}, | ||
78 | }; | 80 | }; |
79 | 81 | ||
80 | /* | 82 | /* |
@@ -82,7 +84,7 @@ static struct at91_usbh_data __initdata afeb9260_usbh_data = { | |||
82 | */ | 84 | */ |
83 | static struct at91_udc_data __initdata afeb9260_udc_data = { | 85 | static struct at91_udc_data __initdata afeb9260_udc_data = { |
84 | .vbus_pin = AT91_PIN_PC5, | 86 | .vbus_pin = AT91_PIN_PC5, |
85 | .pullup_pin = 0, /* pull-up driven by UDC */ | 87 | .pullup_pin = -EINVAL, /* pull-up driven by UDC */ |
86 | }; | 88 | }; |
87 | 89 | ||
88 | 90 | ||
@@ -138,6 +140,7 @@ static struct atmel_nand_data __initdata afeb9260_nand_data = { | |||
138 | .bus_width_16 = 0, | 140 | .bus_width_16 = 0, |
139 | .parts = afeb9260_nand_partition, | 141 | .parts = afeb9260_nand_partition, |
140 | .num_parts = ARRAY_SIZE(afeb9260_nand_partition), | 142 | .num_parts = ARRAY_SIZE(afeb9260_nand_partition), |
143 | .det_pin = -EINVAL, | ||
141 | }; | 144 | }; |
142 | 145 | ||
143 | 146 | ||
@@ -149,6 +152,7 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = { | |||
149 | .wp_pin = AT91_PIN_PC4, | 152 | .wp_pin = AT91_PIN_PC4, |
150 | .slot_b = 1, | 153 | .slot_b = 1, |
151 | .wire4 = 1, | 154 | .wire4 = 1, |
155 | .vcc_pin = -EINVAL, | ||
152 | }; | 156 | }; |
153 | 157 | ||
154 | 158 | ||
@@ -169,6 +173,8 @@ static struct i2c_board_info __initdata afeb9260_i2c_devices[] = { | |||
169 | static struct at91_cf_data afeb9260_cf_data = { | 173 | static struct at91_cf_data afeb9260_cf_data = { |
170 | .chipselect = 4, | 174 | .chipselect = 4, |
171 | .irq_pin = AT91_PIN_PA6, | 175 | .irq_pin = AT91_PIN_PA6, |
176 | .det_pin = -EINVAL, | ||
177 | .vcc_pin = -EINVAL, | ||
172 | .rst_pin = AT91_PIN_PA7, | 178 | .rst_pin = AT91_PIN_PA7, |
173 | .flags = AT91_CF_TRUE_IDE, | 179 | .flags = AT91_CF_TRUE_IDE, |
174 | }; | 180 | }; |