diff options
Diffstat (limited to 'arch/arm/mach-at91/board-usb-a926x.c')
-rw-r--r-- | arch/arm/mach-at91/board-usb-a926x.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index 5852d3d9890c..3d84233f78eb 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c | |||
@@ -146,7 +146,7 @@ static void __init ek_add_device_spi(void) | |||
146 | /* | 146 | /* |
147 | * MACB Ethernet device | 147 | * MACB Ethernet device |
148 | */ | 148 | */ |
149 | static struct at91_eth_data __initdata ek_macb_data = { | 149 | static struct macb_platform_data __initdata ek_macb_data = { |
150 | .phy_irq_pin = AT91_PIN_PE31, | 150 | .phy_irq_pin = AT91_PIN_PE31, |
151 | .is_rmii = 1, | 151 | .is_rmii = 1, |
152 | }; | 152 | }; |
@@ -190,19 +190,14 @@ static struct mtd_partition __initdata ek_nand_partition[] = { | |||
190 | } | 190 | } |
191 | }; | 191 | }; |
192 | 192 | ||
193 | static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) | ||
194 | { | ||
195 | *num_partitions = ARRAY_SIZE(ek_nand_partition); | ||
196 | return ek_nand_partition; | ||
197 | } | ||
198 | |||
199 | static struct atmel_nand_data __initdata ek_nand_data = { | 193 | static struct atmel_nand_data __initdata ek_nand_data = { |
200 | .ale = 21, | 194 | .ale = 21, |
201 | .cle = 22, | 195 | .cle = 22, |
202 | // .det_pin = ... not connected | 196 | // .det_pin = ... not connected |
203 | .rdy_pin = AT91_PIN_PA22, | 197 | .rdy_pin = AT91_PIN_PA22, |
204 | .enable_pin = AT91_PIN_PD15, | 198 | .enable_pin = AT91_PIN_PD15, |
205 | .partition_info = nand_partitions, | 199 | .parts = ek_nand_partition, |
200 | .num_parts = ARRAY_SIZE(ek_nand_partition), | ||
206 | }; | 201 | }; |
207 | 202 | ||
208 | static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = { | 203 | static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = { |