KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: remove superfluous & confusing DT binding

Browse source 
Mediatek has a reference platform that pairs an MT7620A with an MT7530W,
where the latter responds on MDIO address 0x1f while both chips respond on
0x0 to 0x4. The driver special-cases this arrangement to make sure it's
talking to the right chip, but two different ways in two different places.
This patch consolidates the detection without the current requirement of
both tests to be separately satisfied in the DTS.

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
This commit is contained in:
Daniel Gimpelevich 2018-08-01 07:44:20 -07:00 committed by John Crispin
parent f72fa883b3
commit 5a6229a93d
5 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
target/linux/ramips/dts/BR-6478AC-V2.dts
View file

@ -184,7 +184,6 @@
&gsw { &gsw {
mediatek,port4 = "gmac"; mediatek,port4 = "gmac";
mediatek,mt7530 = <1>;
}; };

1
target/linux/ramips/dts/E1700.dts
View file

@ -152,7 +152,6 @@
&gsw { &gsw {
mediatek,port4 = "gmac"; mediatek,port4 = "gmac";
mediatek,mt7530 = <1>;
}; };
&wmac { &wmac {

1
target/linux/ramips/dts/MT7620a_MT7530.dts
View file

@ -104,7 +104,6 @@
&gsw { &gsw {
mediatek,port4 = "gmac"; mediatek,port4 = "gmac";
mediatek,mt7530 = <1>;
}; };
&pcie { &pcie {

1
target/linux/ramips/dts/TINY-AC.dts
View file

@ -146,7 +146,6 @@
&gsw { &gsw {
mediatek,port4 = "gmac"; mediatek,port4 = "gmac";
mediatek,mt7530 = <1>;
}; };
&pcie { &pcie {

27
target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c
View file

@ -60,7 +60,28 @@ static irqreturn_t gsw_interrupt_mt7620(int irq, void *_priv)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void mt7620_hw_init(struct mt7620_gsw *gsw, struct device_node *np) static int mt7620_mdio_mode(struct device_node *eth_node)
{
struct device_node *phy_node, *mdiobus_node;
const __be32 *id;
int ret = 0;
mdiobus_node = of_get_child_by_name(eth_node, "mdio-bus");
if (mdiobus_node) {
for_each_child_of_node(mdiobus_node, phy_node) {
id = of_get_property(phy_node, "reg", NULL);
if (id && (be32_to_cpu(*id) == 0x1f))
ret = 1;
}
of_node_put(mdiobus_node);
}
return ret;
}
static void mt7620_hw_init(struct mt7620_gsw *gsw, int mdio_mode)
{ {
u32 is_BGA = (rt_sysc_r32(0x0c) >> 16) & 1; u32 is_BGA = (rt_sysc_r32(0x0c) >> 16) & 1;
@ -70,7 +91,7 @@ static void mt7620_hw_init(struct mt7620_gsw *gsw, struct device_node *np)
/* Enable MIB stats */ /* Enable MIB stats */
mtk_switch_w32(gsw, mtk_switch_r32(gsw, GSW_REG_MIB_CNT_EN) | (1 << 1), GSW_REG_MIB_CNT_EN); mtk_switch_w32(gsw, mtk_switch_r32(gsw, GSW_REG_MIB_CNT_EN) | (1 << 1), GSW_REG_MIB_CNT_EN);
if (of_property_read_bool(np, "mediatek,mt7530")) { if (mdio_mode) {
u32 val; u32 val;
/* turn off ephy and set phy base addr to 12 */ /* turn off ephy and set phy base addr to 12 */
@ -192,7 +213,7 @@ int mtk_gsw_init(struct fe_priv *priv)
gsw = platform_get_drvdata(pdev); gsw = platform_get_drvdata(pdev);
priv->soc->swpriv = gsw; priv->soc->swpriv = gsw;
mt7620_hw_init(gsw, np); mt7620_hw_init(gsw, mt7620_mdio_mode(priv->dev->of_node));
if (gsw->irq) { if (gsw->irq) {
request_irq(gsw->irq, gsw_interrupt_mt7620, 0, request_irq(gsw->irq, gsw_interrupt_mt7620, 0,