ar71xx: D-Link DIR-825 B1 eth1 MAC address is garbage

[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-dir-825-b1.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
index 7762b5cdc5f5cf64eab1b5cb04f5885912e6836a..3d3114689b48aa71e0e90ef4f358c10b4184980b 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
@@ -14,7 +14,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
-#include <linux/rtl8366_smi.h>
+#include <linux/rtl8366s.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
 
@@ -54,28 +54,33 @@ static struct mtd_partition dir825b1_partitions[] = {
                .offset         = 0,
                .size           = 0x040000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "config",
                .offset         = 0x040000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "firmware",
                .offset         = 0x050000,
                .size           = 0x610000,
-       } , {
+       }, {
                .name           = "caldata",
                .offset         = 0x660000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "unknown",
+               .offset         = 0x670000,
+               .size           = 0x190000,
+               .mask_flags     = MTD_WRITEABLE,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
 
 static struct flash_platform_data dir825b1_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = dir825b1_partitions,
-        .nr_parts       = ARRAY_SIZE(dir825b1_partitions),
+       .parts          = dir825b1_partitions,
+       .nr_parts       = ARRAY_SIZE(dir825b1_partitions),
 #endif
 };
 
@@ -111,52 +116,48 @@ static struct gpio_button dir825b1_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .threshold      = 3,
                .gpio           = DIR825B1_GPIO_BTN_RESET,
                .active_low     = 1,
-       } , {
+       }, {
                .desc           = "powersave",
                .type           = EV_KEY,
                .code           = BTN_1,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = DIR825B1_GPIO_BTN_POWERSAVE,
                .active_low     = 1,
        }
 };
 
-static struct rtl8366_smi_platform_data dir825b1_rtl8366_smi_data = {
+static struct rtl8366s_platform_data dir825b1_rtl8366s_data = {
        .gpio_sda        = DIR825B1_GPIO_RTL8366_SDA,
        .gpio_sck        = DIR825B1_GPIO_RTL8366_SCK,
 };
 
-static struct platform_device dir825b1_rtl8366_smi_device = {
-       .name           = "rtl8366-smi",
+static struct platform_device dir825b1_rtl8366s_device = {
+       .name           = RTL8366S_DRIVER_NAME,
        .id             = -1,
        .dev = {
-               .platform_data  = &dir825b1_rtl8366_smi_data,
+               .platform_data  = &dir825b1_rtl8366s_data,
        }
 };
 
 static void __init dir825b1_setup(void)
 {
-        u8 mac[6], i;
-
-       memcpy(mac, (u8*)KSEG1ADDR(DIR825B1_MAC_LOCATION_1), 6);
-       for(i = 5; i >= 3; i--)
-               if(++mac[i] != 0x00) break;
-
-       ar71xx_set_mac_base(mac);
+       u8 *mac = (u8 *) KSEG1ADDR(DIR825B1_MAC_LOCATION_1);
 
        ar71xx_add_device_mdio(0x0);
 
-       ar71xx_eth0_data.mii_bus_dev = &dir825b1_rtl8366_smi_device.dev;
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 1);
+       ar71xx_eth0_data.mii_bus_dev = &dir825b1_rtl8366s_device.dev;
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth0_data.speed = SPEED_1000;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
        ar71xx_eth0_pll_data.pll_1000 = 0x11110000;
 
-       ar71xx_eth1_data.mii_bus_dev = &dir825b1_rtl8366_smi_device.dev;
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 2);
+       ar71xx_eth1_data.mii_bus_dev = &dir825b1_rtl8366s_device.dev;
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth1_data.phy_mask = 0x10;
        ar71xx_eth1_pll_data.pll_1000 = 0x11110000;
@@ -175,7 +176,7 @@ static void __init dir825b1_setup(void)
 
        ar71xx_add_device_usb();
 
-       platform_device_register(&dir825b1_rtl8366_smi_device);
+       platform_device_register(&dir825b1_rtl8366s_device);
 
        ap94_pci_init((u8 *) KSEG1ADDR(DIR825B1_CAL_LOCATION_0),
                      (u8 *) KSEG1ADDR(DIR825B1_MAC_LOCATION_0),