diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:21:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:21:03 -0500 |
commit | acc952c1f373bf3f66cc7a10680eee1762bed40b (patch) | |
tree | de1135ffe304f4d8e53d282e5bb1bde5db04e0ae /arch/arm/mach-at91/board-cam60.c | |
parent | 57e964e1ae9bd4f699ae1074430bcf81a9a11377 (diff) | |
parent | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (diff) |
Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Cleanups on various subarchitectures
Cleanup patches for various ARM platforms and some of their associated
drivers, the bulk of these is for mach-91.
Arnd ended up pulling in the restart branch from Russell in order to
fix up some simple but annoying merge conflicts.
* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
arm/at91: fix build of stamp9g20
ARM: u300: delete memory.h
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
ARM: at91: delete the pcontrol_g20_defconfig
arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
arm/tegra: remove unused defines
arm/tegra: fix variable formatting in makefile
ARM: davinci: vpif: move code to driver core header from platform
ARM: at91/gpio: fix display of number of irq setuped
ARM: at91/gpio: drop PIN_BASE
ARM: at91/udc: use gpio_is_valid to check the gpio
ARM: at91/ohci: use gpio_is_valid to check the gpio
ARM: at91/nand: use gpio_is_valid to check the gpio
ARM: at91/mmc: use gpio_is_valid to check the gpio
ARM: at91/ide: use gpio_is_valid to check the gpio
ARM: at91/pata: use gpio_is_valid to check the gpio
ARM: at91/soc: use gpio_is_valid to check the gpio
...
Diffstat (limited to 'arch/arm/mach-at91/board-cam60.c')
-rw-r--r-- | arch/arm/mach-at91/board-cam60.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c index f90cfb32bad2..8510e9e54988 100644 --- a/arch/arm/mach-at91/board-cam60.c +++ b/arch/arm/mach-at91/board-cam60.c | |||
@@ -62,6 +62,8 @@ static void __init cam60_init_early(void) | |||
62 | */ | 62 | */ |
63 | static struct at91_usbh_data __initdata cam60_usbh_data = { | 63 | static struct at91_usbh_data __initdata cam60_usbh_data = { |
64 | .ports = 1, | 64 | .ports = 1, |
65 | .vbus_pin = {-EINVAL, -EINVAL}, | ||
66 | .overcurrent_pin= {-EINVAL, -EINVAL}, | ||
65 | }; | 67 | }; |
66 | 68 | ||
67 | 69 | ||
@@ -115,7 +117,7 @@ static struct spi_board_info cam60_spi_devices[] __initdata = { | |||
115 | /* | 117 | /* |
116 | * MACB Ethernet device | 118 | * MACB Ethernet device |
117 | */ | 119 | */ |
118 | static struct __initdata at91_eth_data cam60_macb_data = { | 120 | static struct __initdata macb_platform_data cam60_macb_data = { |
119 | .phy_irq_pin = AT91_PIN_PB5, | 121 | .phy_irq_pin = AT91_PIN_PB5, |
120 | .is_rmii = 0, | 122 | .is_rmii = 0, |
121 | }; | 123 | }; |
@@ -135,7 +137,7 @@ static struct mtd_partition __initdata cam60_nand_partition[] = { | |||
135 | static struct atmel_nand_data __initdata cam60_nand_data = { | 137 | static struct atmel_nand_data __initdata cam60_nand_data = { |
136 | .ale = 21, | 138 | .ale = 21, |
137 | .cle = 22, | 139 | .cle = 22, |
138 | // .det_pin = ... not there | 140 | .det_pin = -EINVAL, |
139 | .rdy_pin = AT91_PIN_PA9, | 141 | .rdy_pin = AT91_PIN_PA9, |
140 | .enable_pin = AT91_PIN_PA7, | 142 | .enable_pin = AT91_PIN_PA7, |
141 | .parts = cam60_nand_partition, | 143 | .parts = cam60_nand_partition, |
@@ -163,7 +165,7 @@ static struct sam9_smc_config __initdata cam60_nand_smc_config = { | |||
163 | static void __init cam60_add_device_nand(void) | 165 | static void __init cam60_add_device_nand(void) |
164 | { | 166 | { |
165 | /* configure chip-select 3 (NAND) */ | 167 | /* configure chip-select 3 (NAND) */ |
166 | sam9_smc_configure(3, &cam60_nand_smc_config); | 168 | sam9_smc_configure(0, 3, &cam60_nand_smc_config); |
167 | 169 | ||
168 | at91_add_device_nand(&cam60_nand_data); | 170 | at91_add_device_nand(&cam60_nand_data); |
169 | } | 171 | } |