From: John Crispin <john@openwrt.org>
Date: Thu, 30 Oct 2014 08:07:49 +0000 (+0000)
Subject: ralink: fix mt7530 for newer silicon revisions
X-Git-Tag: v19.07.0-rc1~16127
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=38692d14f2c816f5a5f57242953ee6ec86197883;p=openwrt%2Fstaging%2Fhauke.git

ralink: fix mt7530 for newer silicon revisions

latest mt7530 silicon seems to have a different phy id.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 43113
---

diff --git a/target/linux/ramips/patches-3.14/0035-NET-MIPS-add-ralink-SoC-ethernet-driver.patch b/target/linux/ramips/patches-3.14/0035-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
index 6e6f7583ad..7bf8545533 100644
--- a/target/linux/ramips/patches-3.14/0035-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
+++ b/target/linux/ramips/patches-3.14/0035-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
@@ -97,7 +97,7 @@ Index: linux-3.14.18/arch/mips/ralink/rt305x.c
 Index: linux-3.14.18/drivers/net/ethernet/Kconfig
 ===================================================================
 --- linux-3.14.18.orig/drivers/net/ethernet/Kconfig	2014-09-06 01:34:59.000000000 +0200
-+++ linux-3.14.18/drivers/net/ethernet/Kconfig	2014-10-29 20:39:55.156284038 +0100
++++ linux-3.14.18/drivers/net/ethernet/Kconfig	2014-10-30 09:02:30.444086136 +0100
 @@ -134,6 +134,7 @@
  source "drivers/net/ethernet/packetengines/Kconfig"
  source "drivers/net/ethernet/pasemi/Kconfig"
@@ -109,7 +109,7 @@ Index: linux-3.14.18/drivers/net/ethernet/Kconfig
 Index: linux-3.14.18/drivers/net/ethernet/Makefile
 ===================================================================
 --- linux-3.14.18.orig/drivers/net/ethernet/Makefile	2014-09-06 01:34:59.000000000 +0200
-+++ linux-3.14.18/drivers/net/ethernet/Makefile	2014-10-29 20:39:55.156284038 +0100
++++ linux-3.14.18/drivers/net/ethernet/Makefile	2014-10-30 09:02:30.444086136 +0100
 @@ -56,6 +56,7 @@
  obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
  obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
@@ -1685,7 +1685,7 @@ Index: linux-3.14.18/drivers/net/ethernet/ralink/esw_rt3052.h
 Index: linux-3.14.18/drivers/net/ethernet/ralink/gsw_mt7620a.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.14.18/drivers/net/ethernet/ralink/gsw_mt7620a.c	2014-10-29 20:33:38.670422146 +0100
++++ linux-3.14.18/drivers/net/ethernet/ralink/gsw_mt7620a.c	2014-10-30 09:02:08.735269671 +0100
 @@ -0,0 +1,569 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify
@@ -2197,7 +2197,7 @@ Index: linux-3.14.18/drivers/net/ethernet/ralink/gsw_mt7620a.c
 +	struct mt7620_gsw *gsw = (struct mt7620_gsw *) priv->soc->swpriv;
 +
 +	/* is the mt7530 internal or external */
-+	if ((_mt7620_mii_read(gsw, 0x1f, 2) == 1) && (_mt7620_mii_read(gsw, 0x1f, 3) == 0xbeef)) {
++	if (priv->mii_bus->phy_map[0x1f]) {
 +		mt7530_probe(priv->device, gsw->base, NULL, 0);
 +		mt7530_probe(priv->device, NULL, priv->mii_bus, 1);
 +	} else {
@@ -2876,8 +2876,8 @@ Index: linux-3.14.18/drivers/net/ethernet/ralink/mdio_rt2880.h
 Index: linux-3.14.18/drivers/net/ethernet/ralink/mt7530.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.14.18/drivers/net/ethernet/ralink/mt7530.c	2014-10-29 20:32:49.124597652 +0100
-@@ -0,0 +1,582 @@
++++ linux-3.14.18/drivers/net/ethernet/ralink/mt7530.c	2014-10-30 09:02:23.967839289 +0100
+@@ -0,0 +1,579 @@
 +/*
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
@@ -3421,9 +3421,6 @@ Index: linux-3.14.18/drivers/net/ethernet/ralink/mt7530.c
 +	struct mt7530_mapping *map;
 +	int ret;
 +
-+	if (bus && bus->phy_map[0x1f]->phy_id != 0x1beef)
-+		return 0;
-+
 +	mt7530 = devm_kzalloc(dev, sizeof(struct mt7530_priv), GFP_KERNEL);
 +	if (!mt7530)
 +		return -ENOMEM;
@@ -3488,7 +3485,7 @@ Index: linux-3.14.18/drivers/net/ethernet/ralink/mt7530.h
 Index: linux-3.14.18/drivers/net/ethernet/ralink/ralink_soc_eth.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.14.18/drivers/net/ethernet/ralink/ralink_soc_eth.c	2014-10-29 20:25:55.433357519 +0100
++++ linux-3.14.18/drivers/net/ethernet/ralink/ralink_soc_eth.c	2014-10-30 07:59:41.679492638 +0100
 @@ -0,0 +1,1331 @@
 +/*
 + *   This program is free software; you can redistribute it and/or modify