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-cpu9krea.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-cpu9krea.c')
-rw-r--r-- | arch/arm/mach-at91/board-cpu9krea.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c index 5b55525e2966..9ab3d1ea326d 100644 --- a/arch/arm/mach-at91/board-cpu9krea.c +++ b/arch/arm/mach-at91/board-cpu9krea.c | |||
@@ -86,6 +86,8 @@ static void __init cpu9krea_init_early(void) | |||
86 | */ | 86 | */ |
87 | static struct at91_usbh_data __initdata cpu9krea_usbh_data = { | 87 | static struct at91_usbh_data __initdata cpu9krea_usbh_data = { |
88 | .ports = 2, | 88 | .ports = 2, |
89 | .vbus_pin = {-EINVAL, -EINVAL}, | ||
90 | .overcurrent_pin= {-EINVAL, -EINVAL}, | ||
89 | }; | 91 | }; |
90 | 92 | ||
91 | /* | 93 | /* |
@@ -93,13 +95,14 @@ static struct at91_usbh_data __initdata cpu9krea_usbh_data = { | |||
93 | */ | 95 | */ |
94 | static struct at91_udc_data __initdata cpu9krea_udc_data = { | 96 | static struct at91_udc_data __initdata cpu9krea_udc_data = { |
95 | .vbus_pin = AT91_PIN_PC8, | 97 | .vbus_pin = AT91_PIN_PC8, |
96 | .pullup_pin = 0, /* pull-up driven by UDC */ | 98 | .pullup_pin = -EINVAL, /* pull-up driven by UDC */ |
97 | }; | 99 | }; |
98 | 100 | ||
99 | /* | 101 | /* |
100 | * MACB Ethernet device | 102 | * MACB Ethernet device |
101 | */ | 103 | */ |
102 | static struct macb_platform_data __initdata cpu9krea_macb_data = { | 104 | static struct macb_platform_data __initdata cpu9krea_macb_data = { |
105 | .phy_irq_pin = -EINVAL, | ||
103 | .is_rmii = 1, | 106 | .is_rmii = 1, |
104 | }; | 107 | }; |
105 | 108 | ||
@@ -112,6 +115,7 @@ static struct atmel_nand_data __initdata cpu9krea_nand_data = { | |||
112 | .rdy_pin = AT91_PIN_PC13, | 115 | .rdy_pin = AT91_PIN_PC13, |
113 | .enable_pin = AT91_PIN_PC14, | 116 | .enable_pin = AT91_PIN_PC14, |
114 | .bus_width_16 = 0, | 117 | .bus_width_16 = 0, |
118 | .det_pin = -EINVAL, | ||
115 | }; | 119 | }; |
116 | 120 | ||
117 | #ifdef CONFIG_MACH_CPU9260 | 121 | #ifdef CONFIG_MACH_CPU9260 |
@@ -337,6 +341,8 @@ static struct at91_mmc_data __initdata cpu9krea_mmc_data = { | |||
337 | .slot_b = 0, | 341 | .slot_b = 0, |
338 | .wire4 = 1, | 342 | .wire4 = 1, |
339 | .det_pin = AT91_PIN_PA29, | 343 | .det_pin = AT91_PIN_PA29, |
344 | .wp_pin = -EINVAL, | ||
345 | .vcc_pin = -EINVAL, | ||
340 | }; | 346 | }; |
341 | 347 | ||
342 | static void __init cpu9krea_board_init(void) | 348 | static void __init cpu9krea_board_init(void) |