ar71xx: cap324: Use correct MAC addresses

The wrong MAC addresses (from the point of view of the physical device
label) were being assigned to the wrong interfaces.  Fix that.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
(backported from 739eaae9ca86b243b81009fc21fb7ecc8a7b5b82)

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cap324.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cap324.c
index 2a6aed5b4c34f8ffbf5cdde36de13f712fad250c..edde8a24bbd2f171915c54f22ebe3cf8cad10388 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cap324.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cap324.c
@@ -106,11 +106,11 @@ static void __init cap324_setup(void)
                                        ARRAY_SIZE(cap324_gpio_keys),
                                        cap324_gpio_keys);
 
-       ath79_init_mac(mac, art + CAP324_MAC_OFFSET, -1);
+       ath79_init_mac(mac, art + CAP324_MAC_OFFSET, -2);
        ath79_wmac_disable_2ghz();
        ath79_register_wmac(art + CAP324_WMAC_CALDATA_OFFSET, mac);
 
-       ath79_init_mac(mac, art + CAP324_MAC_OFFSET, -2);
+       ath79_init_mac(mac, art + CAP324_MAC_OFFSET, -1);
        ap91_pci_init(art + CAP324_PCIE_CALDATA_OFFSET, mac);
 
        ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
@@ -119,7 +119,7 @@ static void __init cap324_setup(void)
        ath79_register_mdio(0, 0x0);
 
        ath79_init_mac(ath79_eth0_data.mac_addr,
-                      art + CAP324_MAC_OFFSET, -2);
+                      art + CAP324_MAC_OFFSET, 0);
 
        /* GMAC0 is connected to an external PHY */
        ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;