diff options
author | Andrew Victor <avictor.za@gmail.com> | 2012-04-25 20:30:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-28 21:48:37 -0400 |
commit | c5f0f83c3be4c965c40c78d52000db30c0ceab5d (patch) | |
tree | 0e3dbeef02ae0b78325ca1da997ee3507255110e /arch/arm/mach-at91/at91rm9200_devices.c | |
parent | cb75a36c8a1ab68e2dbfbe172f12c792b0c6dba8 (diff) |
AT91: Remove fixed mapping for AT91RM9200 ethernet
The AT91RM9200 Ethernet controller still has a fixed IO mapping.
So:
* Remove the fixed IO mapping and AT91_VA_BASE_EMAC definition.
* Pass the physical base-address via platform-resources to the driver.
* Convert at91_ether.c driver to perform an ioremap().
* Ethernet PHY detection needs to be performed during the driver
initialization process, it can no longer be done first.
Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91rm9200_devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 05774e5b1cba..60c472861e5e 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c | |||
@@ -140,8 +140,8 @@ static struct macb_platform_data eth_data; | |||
140 | 140 | ||
141 | static struct resource eth_resources[] = { | 141 | static struct resource eth_resources[] = { |
142 | [0] = { | 142 | [0] = { |
143 | .start = AT91_VA_BASE_EMAC, | 143 | .start = AT91RM9200_BASE_EMAC, |
144 | .end = AT91_VA_BASE_EMAC + SZ_16K - 1, | 144 | .end = AT91RM9200_BASE_EMAC + SZ_16K - 1, |
145 | .flags = IORESOURCE_MEM, | 145 | .flags = IORESOURCE_MEM, |
146 | }, | 146 | }, |
147 | [1] = { | 147 | [1] = { |