diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-12-20 15:31:46 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-22 16:40:33 +0100 |
commit | 6f7b297b7a7a1fc7cf55010ef863c59156175bd9 (patch) | |
tree | 3d17c51d344229e199164064f831de2d747f92b7 /arch/arm/boards | |
parent | 8ad572546546990161f3f29e0f9cfc7928ca2892 (diff) | |
download | barebox-6f7b297b7a7a1fc7cf55010ef863c59156175bd9.tar.gz barebox-6f7b297b7a7a1fc7cf55010ef863c59156175bd9.tar.xz |
at91: use -EINVAL for invalid gpio
switch gpio type from u8 to int in the data struct
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards')
-rw-r--r-- | arch/arm/boards/at91rm9200ek/init.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/at91sam9260ek/init.c | 3 | ||||
-rw-r--r-- | arch/arm/boards/at91sam9261ek/init.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/at91sam9263ek/init.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/at91sam9m10g45ek/init.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/at91sam9n12ek/init.c | 4 | ||||
-rw-r--r-- | arch/arm/boards/at91sam9x5ek/init.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/dss11/init.c | 3 | ||||
-rw-r--r-- | arch/arm/boards/pm9261/init.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/pm9263/init.c | 2 | ||||
-rw-r--r-- | arch/arm/boards/pm9g45/init.c | 4 | ||||
-rw-r--r-- | arch/arm/boards/qil-a9260/init.c | 4 | ||||
-rw-r--r-- | arch/arm/boards/tny-a926x/init.c | 4 | ||||
-rw-r--r-- | arch/arm/boards/usb-a926x/init.c | 3 |
14 files changed, 21 insertions, 17 deletions
diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c index f5d242ff94..a40d3b9036 100644 --- a/arch/arm/boards/at91rm9200ek/init.c +++ b/arch/arm/boards/at91rm9200ek/init.c @@ -47,6 +47,7 @@ mem_initcall(at91rm9200ek_mem_init); static struct at91_usbh_data ek_usbh_data = { .ports = 2, + .vbus_pin = { -EINVAL, -EINVAL }, }; #ifdef CONFIG_LED_GPIO diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c index e9bfee6f0d..5816a1d8e5 100644 --- a/arch/arm/boards/at91sam9260ek/init.c +++ b/arch/arm/boards/at91sam9260ek/init.c @@ -59,7 +59,7 @@ static void ek_set_board_type(void) static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) @@ -187,6 +187,7 @@ static void ek_usb_add_device_mci(void) {} */ static struct at91_usbh_data __initdata ek_usbh_data = { .ports = 2, + .vbus_pin = { -EINVAL, -EINVAL }, }; /* diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c index 8842cfe144..0020c92156 100644 --- a/arch/arm/boards/at91sam9261ek/init.c +++ b/arch/arm/boards/at91sam9261ek/init.c @@ -42,7 +42,7 @@ static struct atmel_nand_data nand_pdata = { .ale = 22, .cle = 21, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PC15, .enable_pin = AT91_PIN_PC14, #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c index 45a30fd537..50e4009bd2 100644 --- a/arch/arm/boards/at91sam9263ek/init.c +++ b/arch/arm/boards/at91sam9263ek/init.c @@ -40,7 +40,7 @@ static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PA22, .enable_pin = AT91_PIN_PD15, #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) diff --git a/arch/arm/boards/at91sam9m10g45ek/init.c b/arch/arm/boards/at91sam9m10g45ek/init.c index 4b6d5c4014..7d01d96c5c 100644 --- a/arch/arm/boards/at91sam9m10g45ek/init.c +++ b/arch/arm/boards/at91sam9m10g45ek/init.c @@ -63,7 +63,7 @@ static void ek_set_board_revision(void) static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PC8, .enable_pin = AT91_PIN_PC14, #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) diff --git a/arch/arm/boards/at91sam9n12ek/init.c b/arch/arm/boards/at91sam9n12ek/init.c index 3d4ab5b0cc..51c4fb04a8 100644 --- a/arch/arm/boards/at91sam9n12ek/init.c +++ b/arch/arm/boards/at91sam9n12ek/init.c @@ -44,7 +44,7 @@ static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, - .det_pin = 0, + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PD5, .enable_pin = AT91_PIN_PD4, .ecc_mode = NAND_ECC_HW, @@ -186,7 +186,7 @@ static void ek_add_device_spi(void) */ static struct at91_udc_data __initdata ek_udc_data = { .vbus_pin = AT91_PIN_PB16, - .pullup_pin = 0, /* pull-up driven by UDC */ + .pullup_pin = -EINVAL, /* pull-up driven by UDC */ }; struct gpio_led leds[] = { diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c index ba5bc470e4..39765e0a58 100644 --- a/arch/arm/boards/at91sam9x5ek/init.c +++ b/arch/arm/boards/at91sam9x5ek/init.c @@ -53,7 +53,7 @@ struct w1_gpio_platform_data w1_pdata = { static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, - .det_pin = 0, + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PD5, .enable_pin = AT91_PIN_PD4, .ecc_mode = NAND_ECC_HW, diff --git a/arch/arm/boards/dss11/init.c b/arch/arm/boards/dss11/init.c index aacef3342f..27c1ec7f69 100644 --- a/arch/arm/boards/dss11/init.c +++ b/arch/arm/boards/dss11/init.c @@ -38,7 +38,7 @@ static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .ecc_mode = NAND_ECC_HW, .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, @@ -117,6 +117,7 @@ static struct atmel_mci_platform_data dss11_mci_data = { static struct at91_usbh_data dss11_usbh_data = { .ports = 2, + .vbus_pin = { -EINVAL, -EINVAL }, }; static int dss11_mem_init(void) diff --git a/arch/arm/boards/pm9261/init.c b/arch/arm/boards/pm9261/init.c index 6d2ac98156..a91fa7ab97 100644 --- a/arch/arm/boards/pm9261/init.c +++ b/arch/arm/boards/pm9261/init.c @@ -47,7 +47,7 @@ struct w1_gpio_platform_data w1_pdata = { static struct atmel_nand_data nand_pdata = { .ale = 22, .cle = 21, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PA16, .enable_pin = AT91_PIN_PC14, #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c index 486df9a18e..6a92a677a6 100644 --- a/arch/arm/boards/pm9263/init.c +++ b/arch/arm/boards/pm9263/init.c @@ -47,7 +47,7 @@ struct w1_gpio_platform_data w1_pdata = { static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PB30, .enable_pin = AT91_PIN_PD15, #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c index a79b128089..a974139034 100644 --- a/arch/arm/boards/pm9g45/init.c +++ b/arch/arm/boards/pm9g45/init.c @@ -46,7 +46,7 @@ struct w1_gpio_platform_data w1_pdata = { static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PD3, .enable_pin = AT91_PIN_PC14, .bus_width_16 = 0, @@ -102,7 +102,7 @@ static void pm9g45_add_device_mci(void) {} #ifdef CONFIG_USB_OHCI_AT91 static struct at91_usbh_data __initdata usbh_data = { .ports = 2, - .vbus_pin = { AT91_PIN_PD0, 0x0 }, + .vbus_pin = { AT91_PIN_PD0, -EINVAL }, }; static void __init pm9g45_add_device_usbh(void) diff --git a/arch/arm/boards/qil-a9260/init.c b/arch/arm/boards/qil-a9260/init.c index 3bec4e2d27..a06566c601 100644 --- a/arch/arm/boards/qil-a9260/init.c +++ b/arch/arm/boards/qil-a9260/init.c @@ -32,7 +32,7 @@ static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, - .det_pin = 0, + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, .on_flash_bbt = 1, @@ -120,7 +120,7 @@ static void qil_a9260_phy_reset(void) */ static struct at91_udc_data __initdata ek_udc_data = { .vbus_pin = AT91_PIN_PC5, - .pullup_pin = 0, /* pull-up driven by UDC */ + .pullup_pin = -EINVAL, /* pull-up driven by UDC */ }; static void __init qil_a9260_add_device_mb(void) diff --git a/arch/arm/boards/tny-a926x/init.c b/arch/arm/boards/tny-a926x/init.c index 98f1d2b52e..e30cccfc6c 100644 --- a/arch/arm/boards/tny-a926x/init.c +++ b/arch/arm/boards/tny-a926x/init.c @@ -52,7 +52,7 @@ static void tny_a9260_set_board_type(void) static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, - .det_pin = 0, + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, .on_flash_bbt = 1, @@ -132,7 +132,7 @@ static void __init ek_add_device_macb(void) {} */ static struct at91_udc_data __initdata ek_udc_data = { .vbus_pin = AT91_PIN_PB30, - .pullup_pin = 0, /* pull-up driven by UDC */ + .pullup_pin = -EINVAL, /* pull-up driven by UDC */ }; static struct spi_eeprom eeprom = { diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c index 5190aca8a8..dd136da67c 100644 --- a/arch/arm/boards/usb-a926x/init.c +++ b/arch/arm/boards/usb-a926x/init.c @@ -55,7 +55,7 @@ static void usb_a9260_set_board_type(void) static struct atmel_nand_data nand_pdata = { .ale = 21, .cle = 22, -/* .det_pin = ... not connected */ + .det_pin = -EINVAL, .rdy_pin = AT91_PIN_PC13, .enable_pin = AT91_PIN_PC14, .on_flash_bbt = 1, @@ -208,6 +208,7 @@ static void usb_a9260_add_device_mci(void) {} static struct at91_usbh_data ek_usbh_data = { .ports = 2, + .vbus_pin = { -EINVAL, -EINVAL }, }; /* |