From: Chen Minqiang Date: Fri, 3 Aug 2018 17:14:07 +0000 (+0800) Subject: mt7620: gsw: make IntPHY and ExtPHY share mdio addr 4 possible X-Git-Tag: v18.06.1~51 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b40316c21a960d332bc9b04ee1791b8aafcf8786;p=oweals%2Fopenwrt.git mt7620: gsw: make IntPHY and ExtPHY share mdio addr 4 possible To share mdio addr for IntPHY and ExtPHY, as described in the documentation (MT7620_ProgrammingGuide.pdf). (refer: http://download.villagetelco.org/hardware/MT7620/MT7620_ProgrammingGuide.pdf) when port4 setup to work as gmac mode, dts like: &gsw { mediatek,port4 = "gmac"; }; we should set SYSCFG1.GE2_MODE==0x0 (RGMII). but SYSCFG1.GE2_MODE may have been set to 3(RJ-45) by uboot/default so we need to re-set it to 0x0 before this changes: gsw: 4FE + 2GE may not work correctly and MDIO addr 4 cannot be used by ExtPHY after this changes: gsw: 4FE + 2GE works and MDIO addr 4 can be used by ExtPHY Signed-off-by: Chen Minqiang (cherry picked from commit f6d81e2fa1f110d8025eaa434d67d0014aca1d42) --- diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.c index a4602c4586..fb427ee6fb 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.c +++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.c @@ -168,6 +168,12 @@ static void mt7620_hw_init(struct mt7620_gsw *gsw, struct device_node *np) _mt7620_mii_write(gsw, 4, 16, 0x1313); _mt7620_mii_write(gsw, 4, 0, 0x3100); pr_info("gsw: setting port4 to ephy mode\n"); + } else if (!mdio_mode) { + u32 val = rt_sysc_r32(SYSC_REG_CFG1); + + val &= ~(3 << 14); + rt_sysc_w32(val, SYSC_REG_CFG1); + pr_info("gsw: setting port4 to gmac mode\n"); } }