From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Date: Wed, 1 Aug 2018 14:44:20 +0000 (-0700)
Subject: ramips: remove superfluous & confusing DT binding
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5a6229a93df8a3f292094012a43410c6a24c210e;p=openwrt%2Fstaging%2Fjogo.git

ramips: remove superfluous & confusing DT binding

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>
---

diff --git a/target/linux/ramips/dts/BR-6478AC-V2.dts b/target/linux/ramips/dts/BR-6478AC-V2.dts
index fb2b3ce41e..e2a208d28e 100644
--- a/target/linux/ramips/dts/BR-6478AC-V2.dts
+++ b/target/linux/ramips/dts/BR-6478AC-V2.dts
@@ -184,7 +184,6 @@
 
 &gsw {
 	mediatek,port4 = "gmac";
-	mediatek,mt7530 = <1>;
 };
 
 
diff --git a/target/linux/ramips/dts/E1700.dts b/target/linux/ramips/dts/E1700.dts
index cf136551b4..75e1e07824 100644
--- a/target/linux/ramips/dts/E1700.dts
+++ b/target/linux/ramips/dts/E1700.dts
@@ -152,7 +152,6 @@
 
 &gsw {
 	mediatek,port4 = "gmac";
-	mediatek,mt7530 = <1>;
 };
 
 &wmac {
diff --git a/target/linux/ramips/dts/MT7620a_MT7530.dts b/target/linux/ramips/dts/MT7620a_MT7530.dts
index 117e802ebd..706ba72d11 100644
--- a/target/linux/ramips/dts/MT7620a_MT7530.dts
+++ b/target/linux/ramips/dts/MT7620a_MT7530.dts
@@ -104,7 +104,6 @@
 
 &gsw {
 	mediatek,port4 = "gmac";
-	mediatek,mt7530 = <1>;
 };
 
 &pcie {
diff --git a/target/linux/ramips/dts/TINY-AC.dts b/target/linux/ramips/dts/TINY-AC.dts
index 5098ab7263..f7361497d9 100644
--- a/target/linux/ramips/dts/TINY-AC.dts
+++ b/target/linux/ramips/dts/TINY-AC.dts
@@ -146,7 +146,6 @@
 
 &gsw {
 	mediatek,port4 = "gmac";
-	mediatek,mt7530 = <1>;
 };
 
 &pcie {
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c
index a4602c4586..192603a68c 100644
--- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c
+++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/gsw_mt7620.c
@@ -60,7 +60,28 @@ static irqreturn_t gsw_interrupt_mt7620(int irq, void *_priv)
 	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;
 
@@ -70,7 +91,7 @@ static void mt7620_hw_init(struct mt7620_gsw *gsw, struct device_node *np)
 	/* Enable MIB stats */
 	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;
 
 		/* 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);
 	priv->soc->swpriv = gsw;
 
-	mt7620_hw_init(gsw, np);
+	mt7620_hw_init(gsw, mt7620_mdio_mode(priv->dev->of_node));
 
 	if (gsw->irq) {
 		request_irq(gsw->irq, gsw_interrupt_mt7620, 0,