aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-cam60.c
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-03-08 20:17:06 +0000
committerJamie Iles <jamie@jamieiles.com>2011-11-22 15:21:16 +0000
commit84e0cdb0a262483a3618091c43dae33d36226430 (patch)
tree63d3213354567d1e407db2a4adbc26842deadb68 /arch/arm/mach-at91/board-cam60.c
parentmacb: remove conditional clk handling (diff)
downloadlinux-dev-84e0cdb0a262483a3618091c43dae33d36226430.tar.xz
linux-dev-84e0cdb0a262483a3618091c43dae33d36226430.zip
macb: unify at91 and avr32 platform data
Both at91 and avr32 defines its own platform data structure for the macb driver and both share common structures though at91 includes a currently unused phy_irq_pin. Create a common macb_platform_data for macb that both at91 and avr32 can use. In future we can use this to support other architectures that use the same IP block with the macb driver. v2: rename eth_platform_data to macb_platform_data and allow at91_ether to share the platform data with macb. Signed-off-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/mach-at91/board-cam60.c')
-rw-r--r--arch/arm/mach-at91/board-cam60.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c
index f90cfb32bad2..2037d2c40eb4 100644
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@ -115,7 +115,7 @@ static struct spi_board_info cam60_spi_devices[] __initdata = {
/*
* MACB Ethernet device
*/
-static struct __initdata at91_eth_data cam60_macb_data = {
+static struct __initdata macb_platform_data cam60_macb_data = {
.phy_irq_pin = AT91_PIN_PB5,
.is_rmii = 0,
};