summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Lapin <slapin@ossfans.org>2008-08-12 13:35:34 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-18 23:11:55 +0100
commit53d4351f5868c7d3faa9507608c324ff7d7c186c (patch)
tree32fd9246ed681012c0c0c0d68f4a04f3411e6426
parent9c784f958d01097e3fae24ad75ab3a80ed1e556b (diff)
[ARM] 5219/2: MACB ethernet support for AFEB9260
MACB ethernet support for AFEB9260 Depends on 5210/2 Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Sergey Lapin <slapin@ossfans.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/configs/afeb9260_defconfig2
-rw-r--r--arch/arm/mach-at91/board-afeb-9260v1.c16
2 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/configs/afeb9260_defconfig b/arch/arm/configs/afeb9260_defconfig
index ce84033e619..ce909586a34 100644
--- a/arch/arm/configs/afeb9260_defconfig
+++ b/arch/arm/configs/afeb9260_defconfig
@@ -581,7 +581,7 @@ CONFIG_PHYLIB=y
# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
-# CONFIG_MACB is not set
+CONFIG_MACB=y
# CONFIG_AX88796 is not set
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
index 8778b8e0854..9c040c78889 100644
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@ -106,6 +106,14 @@ static struct spi_board_info afeb9260_spi_devices[] = {
};
+/*
+ * MACB Ethernet device
+ */
+static struct at91_eth_data __initdata afeb9260_macb_data = {
+ .phy_irq_pin = AT91_PIN_PA9,
+ .is_rmii = 0,
+};
+
/*
* NAND flash
@@ -174,6 +182,14 @@ static void __init afeb9260_board_init(void)
ARRAY_SIZE(afeb9260_spi_devices));
/* NAND */
at91_add_device_nand(&afeb9260_nand_data);
+ /* Ethernet */
+ at91_add_device_eth(&afeb9260_macb_data);
+
+ /* Standard function's pin assignments are not
+ * appropriate for us and generic code provide
+ * no API to configure these pins any other way */
+ at91_set_B_periph(AT91_PIN_PA10, 0); /* ETX2 */
+ at91_set_B_periph(AT91_PIN_PA11, 0); /* ETX3 */
/* MMC */
at91_add_device_mmc(0, &afeb9260_mmc_data);
/* I2C */