diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 15:21:04 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 15:23:00 -0500 |
| commit | 928a11ba36f999436915ea2b1eadf54301f93059 (patch) | |
| tree | 8d7cb575d528ddd4b1165e4690401c729c1eb930 /arch/arm/mach-at91/board-afeb-9260v1.c | |
| parent | 237c78beb8a988453bac1993d21f025d070a0d8d (diff) | |
| parent | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (diff) | |
Merge branch 'next/cleanup' into samsung/dt
Conflicts:
arch/arm/mach-exynos/common.c
The common.c file gets changes from rmk/stable-devel (part of
next/cleanup), rmk/restart, samsung/dt and follow-on branches
from the samsung tree.
Pulling it all together here hopefully avoids having to do
even more conflicting merge changesets in this one file. What
a mess!
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/board-afeb-9260v1.c')
| -rw-r--r-- | arch/arm/mach-at91/board-afeb-9260v1.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c index 4282d96dffa8..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 | ||
| @@ -103,7 +105,7 @@ static struct spi_board_info afeb9260_spi_devices[] = { | |||
| 103 | /* | 105 | /* |
| 104 | * MACB Ethernet device | 106 | * MACB Ethernet device |
| 105 | */ | 107 | */ |
| 106 | static struct at91_eth_data __initdata afeb9260_macb_data = { | 108 | static struct macb_platform_data __initdata afeb9260_macb_data = { |
| 107 | .phy_irq_pin = AT91_PIN_PA9, | 109 | .phy_irq_pin = AT91_PIN_PA9, |
| 108 | .is_rmii = 0, | 110 | .is_rmii = 0, |
| 109 | }; | 111 | }; |
| @@ -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 | }; |