ar71xx: compex wpj531 fix setting mac address on ethernet

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-rb750.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
index 305fa2f..5656d3c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
@@ -15,6 +15,7 @@
 #include <linux/phy.h>
 #include <linux/ar8216_platform.h>
 #include <linux/rle.h>
+#include <linux/routerboot.h>
 
 #include <asm/mach-ath79/ar71xx_regs.h>
 #include <asm/mach-ath79/ath79.h>
@@ -26,6 +27,7 @@
 #include "dev-usb.h"
 #include "dev-eth.h"
 #include "machtypes.h"
+#include "routerboot.h"
 
 static struct rb750_led_data rb750_leds[] = {
        {
@@ -182,9 +184,9 @@ static struct ar8327_pad_cfg rb750gr3_ar8327_pad0_cfg = {
 
 static struct ar8327_platform_data rb750gr3_ar8327_data = {
        .pad0_cfg = &rb750gr3_ar8327_pad0_cfg,
-       .cpuport_cfg = {
+       .port0_cfg = {
                .force_link = 1,
-               .speed = AR8327_PORT_SPEED_100,
+               .speed = AR8327_PORT_SPEED_1000,
                .duplex = 1,
                .txpause = 1,
                .rxpause = 1,
@@ -259,6 +261,7 @@ static void __init rb750gr3_setup(void)
        ath79_init_mac(ath79_eth0_data.mac_addr, ath79_mac_base, 0);
        ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ath79_eth0_data.phy_mask = BIT(0);
+       ath79_eth0_pll_data.pll_1000 = 0x62000000;
 
        ath79_register_eth(0);
 
@@ -277,15 +280,17 @@ static void __init rb750gr3_setup(void)
 MIPS_MACHINE(ATH79_MACH_RB_750G_R3, "750Gr3", "MikroTik RouterBOARD 750GL",
             rb750gr3_setup);
 
-#define RB751_HARDCONFIG 0x1f00b000
-#define RB751_MAC_ADDRESS_OFFSET 0xE80
-#define RB751_CALDATA_OFFSET 0x27C
-#define RB751_CALDATA_SIZE     0xc00
+#define RB751_HARDCONFIG       0x1f00b000
+#define RB751_HARDCONFIG_SIZE  0x1000
 
 static void __init rb751_wlan_setup(void)
 {
        u8 *hardconfig = (u8 *) KSEG1ADDR(RB751_HARDCONFIG);
        struct ath9k_platform_data *wmac_data;
+       u16 tag_len;
+       u8 *tag;
+       u16 mac_len;
+       u8 *mac;
        int err;
 
        wmac_data = ap9x_pci_get_wmac_data(0);
@@ -296,17 +301,28 @@ static void __init rb751_wlan_setup(void)
 
        ap9x_pci_setup_wmac_led_pin(0, 9);
 
-       err = rle_decode(hardconfig + RB751_CALDATA_OFFSET,
-                        RB751_CALDATA_SIZE,
-                        (unsigned char *) wmac_data->eeprom_data,
-                        sizeof(wmac_data->eeprom_data),
-                        NULL, NULL);
+       err = routerboot_find_tag(hardconfig, RB751_HARDCONFIG_SIZE,
+                                 RB_ID_WLAN_DATA, &tag, &tag_len);
+       if (err) {
+               pr_err("rb75x: no calibration data found\n");
+               return;
+       }
+
+       err = rle_decode(tag, tag_len, (unsigned char *) wmac_data->eeprom_data,
+                        sizeof(wmac_data->eeprom_data), NULL, NULL);
        if (err) {
                pr_err("rb75x: unable to decode wlan eeprom data\n");
                return;
        }
 
-       ap91_pci_init(NULL, hardconfig + RB751_MAC_ADDRESS_OFFSET);
+       err = routerboot_find_tag(hardconfig, RB751_HARDCONFIG_SIZE,
+                                 RB_ID_MAC_ADDRESS_PACK, &mac, &mac_len);
+       if (err) {
+               pr_err("rb75x: no mac address found\n");
+               return;
+       }
+
+       ap91_pci_init(NULL, mac);
 }
 
 static void __init rb751_setup(void)