From febc416a8fd6c6039239bd5a801013b20e5e109f Mon Sep 17 00:00:00 2001
From: Sergey Lapin <slapin@ossfans.org>
Date: Tue, 12 Aug 2008 13:35:34 +0100
Subject: [PATCH] --- yaml --- r: 112351 b: refs/heads/master c:
 53d4351f5868c7d3faa9507608c324ff7d7c186c h: refs/heads/master i:   112349:
 e326ce3b56fa64ac90b742441af58f98520df963   112347:
 af020407cc579dfeea17b9b933ad3c9157d0495d   112343:
 d4a05c21c46d51751ef9edfe8caec9373dd32fc6   112335:
 05569e3ec43dda388718d4b0cec3cd0f787c7b39   112319:
 c0588d66b9aea69b42e9b836961c1f7cb731c233 v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/configs/afeb9260_defconfig    |  2 +-
 trunk/arch/arm/mach-at91/board-afeb-9260v1.c | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 783ad845f1b7..8155fe89518b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c784f958d01097e3fae24ad75ab3a80ed1e556b
+refs/heads/master: 53d4351f5868c7d3faa9507608c324ff7d7c186c
diff --git a/trunk/arch/arm/configs/afeb9260_defconfig b/trunk/arch/arm/configs/afeb9260_defconfig
index ce84033e619a..ce909586a34f 100644
--- a/trunk/arch/arm/configs/afeb9260_defconfig
+++ b/trunk/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/trunk/arch/arm/mach-at91/board-afeb-9260v1.c b/trunk/arch/arm/mach-at91/board-afeb-9260v1.c
index 8778b8e08549..9c040c78889a 100644
--- a/trunk/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/trunk/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 */