From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 7 Apr 2011 20:53:37 +0000 (+0000)
Subject: ar71xx: register WMAC device on the DB120 board
X-Git-Tag: reboot~16985
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a0c3d49064a25e2e2ea83db0a36e4e38eff625cd;p=oweals%2Fopenwrt.git

ar71xx: register WMAC device on the DB120 board

Signed-off-by: Jaiganesh Narayanan <jnarayanan@atheros.com>

SVN-Revision: 26522
---

diff --git a/target/linux/ar71xx/config-2.6.37 b/target/linux/ar71xx/config-2.6.37
index 13ce22bdce..d5a9413e37 100644
--- a/target/linux/ar71xx/config-2.6.37
+++ b/target/linux/ar71xx/config-2.6.37
@@ -5,6 +5,7 @@ CONFIG_AG71XX_AR8216_SUPPORT=y
 CONFIG_AR71XX_DEV_AP91_PCI=y
 CONFIG_AR71XX_DEV_AP94_PCI=y
 CONFIG_AR71XX_DEV_AR913X_WMAC=y
+CONFIG_AR71XX_DEV_AR934X_WMAC=y
 CONFIG_AR71XX_DEV_DSA=y
 CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
 CONFIG_AR71XX_DEV_LEDS_GPIO=y
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
index 051df4cb76..c35e6cfd9b 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/Kconfig
@@ -30,6 +30,7 @@ config AR71XX_MACH_AP96
 
 config AR71XX_MACH_DB120
 	bool "Atheros DB120 board support"
+	select AR71XX_DEV_AR934X_WMAC
 	select AR71XX_DEV_GPIO_BUTTONS
 	select AR71XX_DEV_LEDS_GPIO
 	select AR71XX_DEV_USB
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c
index aff108faf5..3e4af40bdb 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c
@@ -19,6 +19,7 @@
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-usb.h"
+#include "dev-ar934x-wmac.h"
 
 #define DB120_GPIO_LED_USB	11
 #define DB120_GPIO_LED_WLAN_5G	12
@@ -28,6 +29,9 @@
 
 #define DB120_GPIO_BTN_SW1	16
 
+#define DB120_CALDATA_OFFSET	0x1000
+#define DB120_WMAC_MAC_OFFSET	0x1003
+
 #define DB120_BUTTONS_POLL_INTERVAL	20
 
 #ifdef CONFIG_MTD_PARTITIONS
@@ -106,6 +110,8 @@ static struct gpio_button db120_gpio_buttons[] __initdata = {
 
 static void __init db120_setup(void)
 {
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
 	ar71xx_add_device_usb();
 
 	ar71xx_add_device_m25p80(&db120_flash_data);
@@ -116,6 +122,9 @@ static void __init db120_setup(void)
 	ar71xx_add_device_gpio_buttons(-1, DB120_BUTTONS_POLL_INTERVAL,
 					ARRAY_SIZE(db120_gpio_buttons),
 					db120_gpio_buttons);
+
+	ar934x_add_device_wmac(art + DB120_CALDATA_OFFSET,
+				art + DB120_WMAC_MAC_OFFSET);
 }
 
 MIPS_MACHINE(AR71XX_MACH_DB120, "DB120", "Atheros DB120", db120_setup);