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-rm9200dk.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-rm9200dk.c')
-rw-r--r-- | arch/arm/mach-at91/board-rm9200dk.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c index 022d0cebda9d..782f37946af5 100644 --- a/arch/arm/mach-at91/board-rm9200dk.c +++ b/arch/arm/mach-at91/board-rm9200dk.c | |||
@@ -72,6 +72,8 @@ static struct macb_platform_data __initdata dk_eth_data = { | |||
72 | 72 | ||
73 | static struct at91_usbh_data __initdata dk_usbh_data = { | 73 | static struct at91_usbh_data __initdata dk_usbh_data = { |
74 | .ports = 2, | 74 | .ports = 2, |
75 | .vbus_pin = {-EINVAL, -EINVAL}, | ||
76 | .overcurrent_pin= {-EINVAL, -EINVAL}, | ||
75 | }; | 77 | }; |
76 | 78 | ||
77 | static struct at91_udc_data __initdata dk_udc_data = { | 79 | static struct at91_udc_data __initdata dk_udc_data = { |
@@ -80,16 +82,19 @@ static struct at91_udc_data __initdata dk_udc_data = { | |||
80 | }; | 82 | }; |
81 | 83 | ||
82 | static struct at91_cf_data __initdata dk_cf_data = { | 84 | static struct at91_cf_data __initdata dk_cf_data = { |
85 | .irq_pin = -EINVAL, | ||
83 | .det_pin = AT91_PIN_PB0, | 86 | .det_pin = AT91_PIN_PB0, |
87 | .vcc_pin = -EINVAL, | ||
84 | .rst_pin = AT91_PIN_PC5, | 88 | .rst_pin = AT91_PIN_PC5, |
85 | // .irq_pin = ... not connected | ||
86 | // .vcc_pin = ... always powered | ||
87 | }; | 89 | }; |
88 | 90 | ||
89 | #ifndef CONFIG_MTD_AT91_DATAFLASH_CARD | 91 | #ifndef CONFIG_MTD_AT91_DATAFLASH_CARD |
90 | static struct at91_mmc_data __initdata dk_mmc_data = { | 92 | static struct at91_mmc_data __initdata dk_mmc_data = { |
91 | .slot_b = 0, | 93 | .slot_b = 0, |
92 | .wire4 = 1, | 94 | .wire4 = 1, |
95 | .det_pin = -EINVAL, | ||
96 | .wp_pin = -EINVAL, | ||
97 | .vcc_pin = -EINVAL, | ||
93 | }; | 98 | }; |
94 | #endif | 99 | #endif |
95 | 100 | ||
@@ -143,7 +148,7 @@ static struct atmel_nand_data __initdata dk_nand_data = { | |||
143 | .cle = 21, | 148 | .cle = 21, |
144 | .det_pin = AT91_PIN_PB1, | 149 | .det_pin = AT91_PIN_PB1, |
145 | .rdy_pin = AT91_PIN_PC2, | 150 | .rdy_pin = AT91_PIN_PC2, |
146 | // .enable_pin = ... not there | 151 | .enable_pin = -EINVAL, |
147 | .parts = dk_nand_partition, | 152 | .parts = dk_nand_partition, |
148 | .num_parts = ARRAY_SIZE(dk_nand_partition), | 153 | .num_parts = ARRAY_SIZE(dk_nand_partition), |
149 | }; | 154 | }; |