X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Fppc4xx%2Fmiiphy.c;h=01710e71dd9b8fa32cdcba0c3deeeb1386d18ce6;hb=0ab5410a40930ed235a83161cd7e5a98c963ca91;hp=d303598118db2dada66e4997f7d2bbb8c229e035;hpb=6508f9cd45bd832ced8ef53a7bff379e88e812fe;p=oweals%2Fu-boot.git diff --git a/cpu/ppc4xx/miiphy.c b/cpu/ppc4xx/miiphy.c index d303598118..01710e71dd 100644 --- a/cpu/ppc4xx/miiphy.c +++ b/cpu/ppc4xx/miiphy.c @@ -236,28 +236,24 @@ unsigned int miiphy_getemac_offset(u8 addr) #endif #if defined(CONFIG_460EX) || defined(CONFIG_460GT) - u32 mode_reg; u32 eoffset = 0; switch (addr) { #if defined(CONFIG_HAS_ETH1) && defined(CONFIG_GPCS_PHY1_ADDR) case CONFIG_GPCS_PHY1_ADDR: - mode_reg = in_be32((void *)EMAC_M1 + 0x100); - if (addr == EMAC_M1_IPPA_GET(mode_reg)) + if (addr == EMAC_M1_IPPA_GET(in_be32((void *)EMAC_M1 + 0x100))) eoffset = 0x100; break; #endif #if defined(CONFIG_HAS_ETH2) && defined(CONFIG_GPCS_PHY2_ADDR) case CONFIG_GPCS_PHY2_ADDR: - mode_reg = in_be32((void *)EMAC_M1 + 0x300); - if (addr == EMAC_M1_IPPA_GET(mode_reg)) + if (addr == EMAC_M1_IPPA_GET(in_be32((void *)EMAC_M1 + 0x300))) eoffset = 0x300; break; #endif #if defined(CONFIG_HAS_ETH3) && defined(CONFIG_GPCS_PHY3_ADDR) case CONFIG_GPCS_PHY3_ADDR: - mode_reg = in_be32((void *)EMAC_M1 + 0x400); - if (addr == EMAC_M1_IPPA_GET(mode_reg)) + if (addr == EMAC_M1_IPPA_GET(in_be32((void *)EMAC_M1 + 0x400))) eoffset = 0x400; break; #endif @@ -305,7 +301,7 @@ static int emac_miiphy_command(u8 addr, u8 reg, int cmd, u16 value) sta_reg = reg; /* reg address */ - /* set clock (50Mhz) and read flags */ + /* set clock (50MHz) and read flags */ #if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \