summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-gsia18s.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD2011-11-24 18:51:06 +0100
committerArnd Bergmann2011-11-29 16:46:14 +0100
commit63b4c2967850033de0a488d2ba7cd09052199d99 (patch)
tree86a21775f577fa5b7ea83ca81cfce1912d6cc29c /arch/arm/mach-at91/board-gsia18s.c
parentARM: at91: gpio make struct at91_gpio_bank an initdata (diff)
downloadkernel-qcow2-linux-63b4c2967850033de0a488d2ba7cd09052199d99.tar.gz
kernel-qcow2-linux-63b4c2967850033de0a488d2ba7cd09052199d99.tar.xz
kernel-qcow2-linux-63b4c2967850033de0a488d2ba7cd09052199d99.zip
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-gsia18s.c')
-rw-r--r--arch/arm/mach-at91/board-gsia18s.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c
index 51c82f151119..230e71969fb7 100644
--- a/arch/arm/mach-at91/board-gsia18s.c
+++ b/arch/arm/mach-at91/board-gsia18s.c
@@ -80,6 +80,8 @@ static void __init gsia18s_init_early(void)
*/
static struct at91_usbh_data __initdata usbh_data = {
.ports = 2,
+ .vbus_pin = {-EINVAL, -EINVAL},
+ .overcurrent_pin= {-EINVAL, -EINVAL},
};
/*
@@ -87,7 +89,7 @@ static struct at91_usbh_data __initdata usbh_data = {
*/
static struct at91_udc_data __initdata udc_data = {
.vbus_pin = AT91_PIN_PA22,
- .pullup_pin = 0, /* pull-up driven by UDC */
+ .pullup_pin = -EINVAL, /* pull-up driven by UDC */
};
/*
@@ -530,6 +532,7 @@ static struct i2c_board_info __initdata gsia18s_i2c_devices[] = {
static struct at91_cf_data __initdata gsia18s_cf1_data = {
.irq_pin = AT91_PIN_PA27,
.det_pin = AT91_PIN_PB30,
+ .vcc_pin = -EINVAL,
.rst_pin = AT91_PIN_PB31,
.chipselect = 5,
.flags = AT91_CF_TRUE_IDE,