ar71xx: pass eeprom and mac address location to the ar913x_add_device_wmac function

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-ap83.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
index fe0e5026bb30d19b68c2f63e90297439ecf089cd..e72574ac0912ebf2c21bb6a3154a592301156bec 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
@@ -11,18 +11,21 @@
 
 #include <linux/delay.h>
 #include <linux/platform_device.h>
-#include <linux/input.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
 #include <linux/spi/vsc7385.h>
 
-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
+#include <asm/mach-ar71xx/ar91xx_flash.h>
 
+#include "machtype.h"
 #include "devices.h"
+#include "dev-ar913x-wmac.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
 
 #define AP83_GPIO_LED_WLAN     6
 #define AP83_GPIO_LED_POWER    14
@@ -35,6 +38,8 @@
 #define AP83_050_GPIO_VSC7385_MOSI     16
 #define AP83_050_GPIO_VSC7385_SCK      17
 
+#define AP83_BUTTONS_POLL_INTERVAL     20
+
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition ap83_flash_partitions[] = {
        {
@@ -48,27 +53,27 @@ static struct mtd_partition ap83_flash_partitions[] = {
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
        } , {
-               .name           = "rootfs",
+               .name           = "kernel",
                .offset         = 0x060000,
-               .size           = 0x400000,
+               .size           = 0x140000,
        } , {
-               .name           = "kernel",
-               .offset         = 0x460000,
-               .size           = 0x100000,
+               .name           = "rootfs",
+               .offset         = 0x1a0000,
+               .size           = 0x650000,
        } , {
                .name           = "art",
-               .offset         = 0x560000,
-               .size           = 0x2a0000,
+               .offset         = 0x7f0000,
+               .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
        } , {
                .name           = "firmware",
                .offset         = 0x060000,
-               .size           = 0x500000,
+               .size           = 0x790000,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
 
-static struct physmap_flash_data ap83_flash_data = {
+static struct ar91xx_flash_platform_data ap83_flash_data = {
        .width          = 2,
 #ifdef CONFIG_MTD_PARTITIONS
         .parts          = ap83_flash_partitions,
@@ -85,7 +90,7 @@ static struct resource ap83_flash_resources[] = {
 };
 
 static struct platform_device ap83_flash_device = {
-       .name           = "physmap-flash",
+       .name           = "ar91xx-flash",
        .id             = -1,
        .resource       = ap83_flash_resources,
        .num_resources  = ARRAY_SIZE(ap83_flash_resources),
@@ -168,6 +173,12 @@ static void ap83_vsc7385_reset(void)
 
 static struct vsc7385_platform_data ap83_vsc7385_data = {
        .reset          = ap83_vsc7385_reset,
+       .ucode_name     = "vsc7385_ucode_ap83.bin",
+       .mac_cfg = {
+               .tx_ipg         = 6,
+               .bit2           = 0,
+               .clk_sel        = 3,
+       },
 };
 
 static struct spi_board_info ap83_spi_info[] = {
@@ -183,9 +194,9 @@ static struct spi_board_info ap83_spi_info[] = {
 
 static void __init ap83_generic_setup(void)
 {
-       u8 *mac = (u8 *) KSEG1ADDR(0x1fff1000);
+       u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_set_mac_base(mac);
+       ar71xx_set_mac_base(eeprom);
 
        ar71xx_add_device_mdio(0xfffffffe);
 
@@ -206,12 +217,13 @@ static void __init ap83_generic_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ap83_leds_gpio),
                                        ap83_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, 20, ARRAY_SIZE(ap83_gpio_buttons),
+       ar71xx_add_device_gpio_buttons(-1, AP83_BUTTONS_POLL_INTERVAL,
+                                       ARRAY_SIZE(ap83_gpio_buttons),
                                        ap83_gpio_buttons);
 
        ar71xx_add_device_usb();
 
-       ar91xx_add_device_wmac();
+       ar913x_add_device_wmac(eeprom, NULL);
 
        platform_device_register(&ap83_flash_device);
 
@@ -220,7 +232,7 @@ static void __init ap83_generic_setup(void)
 
 static void __init ap83_040_setup(void)
 {
-       ar71xx_flash_lock_enable();
+       ap83_flash_data.is_shared=1;
        ap83_generic_setup();
        platform_device_register(&ap83_040_spi_device);
 }