Changeset 35855


Ignore:
Timestamp:
2013-03-03T13:47:37+01:00 (5 years ago)
Author:
juhosg
Message:

ar71xx: update MAC address assignment for dir-825-c1

Signed-off-by: Alexander Stadler <sa.maillists@…>
Signed-off-by: Gabor Juhos <juhosg@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c

    r35854 r35855  
    151151        u8 *mac = (u8 *) KSEG1ADDR(0x1ffe0000); 
    152152        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); 
    153         u8 tmpmac[ETH_ALEN]; 
    154         u8 mac1[ETH_ALEN], mac2[ETH_ALEN]; 
     153        u8 mac0[ETH_ALEN], mac1[ETH_ALEN]; 
     154        u8 wmac0[ETH_ALEN], wmac1[ETH_ALEN]; 
    155155 
    156         dir825c1_read_ascii_mac(mac1, mac + DIR825C1_MAC0_OFFSET); 
    157         dir825c1_read_ascii_mac(mac2, mac + DIR825C1_MAC1_OFFSET); 
     156        dir825c1_read_ascii_mac(mac0, mac + DIR825C1_MAC0_OFFSET); 
     157        dir825c1_read_ascii_mac(mac1, mac + DIR825C1_MAC1_OFFSET); 
    158158 
    159159        ath79_gpio_output_select(DIR825C1_GPIO_LED_BLUE_USB, AR934X_GPIO_OUT_GPIO); 
     
    170170        ap9x_pci_setup_wmac_led_pin(1, 32); 
    171171 
    172         ath79_init_mac(tmpmac, mac1, 0); 
    173         ath79_register_wmac(art + DIR825C1_WMAC_CALDATA_OFFSET, tmpmac); 
     172        ath79_init_mac(wmac0, mac0, 0); 
     173        ath79_register_wmac(art + DIR825C1_WMAC_CALDATA_OFFSET, wmac0); 
    174174 
    175         ath79_init_mac(tmpmac, mac2, 0); 
    176         ap91_pci_init(art + DIR825C1_PCIE_CALDATA_OFFSET, tmpmac); 
     175        ath79_init_mac(wmac1, mac1, 1); 
     176        ap91_pci_init(art + DIR825C1_PCIE_CALDATA_OFFSET, wmac1); 
    177177 
    178178        ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0); 
     
    183183        ath79_register_mdio(0, 0x0); 
    184184 
    185         ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0); 
     185        ath79_init_mac(ath79_eth0_data.mac_addr, mac0, 0); 
    186186 
    187187        /* GMAC0 is connected to an AR8327N switch */ 
Note: See TracChangeset for help on using the changeset viewer.