diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-08-06 19:52:06 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-08-06 19:54:19 +0200 |
| commit | cb043ad8dada30e8d5ff454abb38d516e75aeff9 (patch) | |
| tree | d2011159dc7a5f5ac6e0e36694367485f9a238cb /target | |
| parent | 6c075777d5afdeef7516e5125526b3f2c406f453 (diff) | |
| download | upstream-cb043ad8dada30e8d5ff454abb38d516e75aeff9.tar.gz upstream-cb043ad8dada30e8d5ff454abb38d516e75aeff9.tar.bz2 upstream-cb043ad8dada30e8d5ff454abb38d516e75aeff9.zip | |
Revert "mt7620: gsw: make IntPHY and ExtPHY share mdio addr 4 possible"
This reverts commit b40316c21a960d332bc9b04ee1791b8aafcf8786.
That change causes ramips/mt7620 to fail with:
drivers/net/ethernet/mtk/gsw_mt7620.c: In function 'mt7620_hw_init':
drivers/net/ethernet/mtk/gsw_mt7620.c:171:14: error: 'mdio_mode' undeclared (first use in this function); did you mean 'd_move'?
} else if (!mdio_mode) {
^~~~~~~~~
d_move
Back it out for now to restore compilation.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ramips/files-4.14/drivers/net/ethernet/mtk/gsw_mt7620.c | 6 |
1 files changed, 0 insertions, 6 deletions
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 fb427ee6fb..a4602c4586 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,12 +168,6 @@ 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"); } } |