aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2020-01-21 21:11:20 +0100
committerDavid Bauer <mail@david-bauer.net>2020-01-22 22:54:14 +0100
commit5f4f269ce12558e90743512e08be0f2b8b701279 (patch)
tree7409a340490a9a35a840db736e5251bb7bdb3300
parenta8898f1a1126279e4c316fd217365bc463f7db0b (diff)
downloadupstream-5f4f269ce12558e90743512e08be0f2b8b701279.tar.gz
upstream-5f4f269ce12558e90743512e08be0f2b8b701279.tar.bz2
upstream-5f4f269ce12558e90743512e08be0f2b8b701279.zip
generic at803x: remove unneeded patches
- Remove the "RGMII TX delay fixup" hack and the associated DT-property. It was never used in a DT-based platform and solved a problem which can be mitigated by using correct delays on the MAC side. - Remove the patch to enable platform-data support for the at803x driver. It was only used by ar71xx which does not (and never will) support kernel 4.19 or later. - Remove the SmartEEE DT-configuration patch. As explained previously, this patch never disabled the Atheros SmartEEE implementation, but rather "standard" EEE. This can be done on device-tree compatible platforms by adding the "eee-broken-1000t" or "eee-broken-100tx" properties to the PHY node. As all usages of the old properties are migrated, this patch can be removed. Signed-off-by: David Bauer <mail@david-bauer.net> Acked-by: Christian Lamparter <chunkeey@gmail.com>
-rw-r--r--target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch47
-rw-r--r--target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch142
-rw-r--r--target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch47
3 files changed, 0 insertions, 236 deletions
diff --git a/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch b/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch
deleted file mode 100644
index 6bc626dd6a..0000000000
--- a/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -354,6 +354,14 @@ static int at803x_config_init(struct phy
- AT803X_DEBUG_TX_CLK_DLY_EN, 0);
- }
-
-+#ifdef CONFIG_OF_MDIO
-+ if (phydev->mdio.dev.of_node &&
-+ of_property_read_bool(phydev->mdio.dev.of_node,
-+ "at803x-disable-smarteee")) {
-+ at803x_disable_smarteee(phydev);
-+ }
-+#endif
-+
- return 0;
- }
-
-@@ -392,6 +400,7 @@ static void at803x_link_change_notify(st
- {
- struct at803x_priv *priv = phydev->priv;
- struct at803x_platform_data *pdata;
-+ u8 fixup_rgmii_tx_delay = 0;
- pdata = dev_get_platdata(&phydev->mdio.dev);
-
- /*
-@@ -421,8 +430,19 @@ static void at803x_link_change_notify(st
- } else {
- priv->phy_reset = false;
- }
-- if (pdata && pdata->fixup_rgmii_tx_delay &&
-- phydev->speed != priv->prev_speed) {
-+
-+ if (pdata && pdata->fixup_rgmii_tx_delay)
-+ fixup_rgmii_tx_delay = 1;
-+
-+#ifdef CONFIG_OF_MDIO
-+ if (phydev->mdio.dev.of_node &&
-+ of_property_read_bool(phydev->mdio.dev.of_node,
-+ "at803x-fixup-rgmii-tx-delay")) {
-+ fixup_rgmii_tx_delay = 1;
-+ }
-+#endif
-+
-+ if (fixup_rgmii_tx_delay && phydev->speed != priv->prev_speed) {
- switch (phydev->speed) {
- case SPEED_10:
- case SPEED_100:
diff --git a/target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch b/target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch
deleted file mode 100644
index e56e77addf..0000000000
--- a/target/linux/generic/pending-4.19/734-net-phy-at803x-allow-to-configure-via-pdata.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: net: phy: allow to configure AR803x PHYs via platform data
-
-Add a patch for the at803x phy driver, in order to be able
-to configure some register settings via platform data.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/phy/at803x.c | 56 ++++++++++++++++++++++++++++++++
- include/linux/platform_data/phy-at803x.h | 11 +++++++
- 2 files changed, 67 insertions(+)
- create mode 100644 include/linux/platform_data/phy-at803x.h
-
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -12,12 +12,14 @@
- */
-
- #include <linux/phy.h>
-+#include <linux/mdio.h>
- #include <linux/module.h>
- #include <linux/string.h>
- #include <linux/netdevice.h>
- #include <linux/etherdevice.h>
- #include <linux/of_gpio.h>
- #include <linux/gpio/consumer.h>
-+#include <linux/platform_data/phy-at803x.h>
-
- #define AT803X_INTR_ENABLE 0x12
- #define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15)
-@@ -45,6 +47,11 @@
- #define AT803X_REG_CHIP_CONFIG 0x1f
- #define AT803X_BT_BX_REG_SEL 0x8000
-
-+#define AT803X_PCS_SMART_EEE_CTRL3 0x805D
-+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3
-+#define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT 12
-+#define AT803X_SMART_EEE_CTRL3_LPI_EN BIT(8)
-+
- #define AT803X_DEBUG_ADDR 0x1D
- #define AT803X_DEBUG_DATA 0x1E
-
-@@ -73,6 +80,7 @@ MODULE_LICENSE("GPL");
-
- struct at803x_priv {
- bool phy_reset:1;
-+ int prev_speed;
- };
-
- struct at803x_context {
-@@ -249,8 +257,16 @@ static int at803x_probe(struct phy_devic
- return 0;
- }
-
-+static void at803x_disable_smarteee(struct phy_device *phydev)
-+{
-+ phy_write_mmd(phydev, MDIO_MMD_PCS, AT803X_PCS_SMART_EEE_CTRL3,
-+ 1 << AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_SHIFT);
-+ phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0);
-+}
-+
- static int at803x_config_init(struct phy_device *phydev)
- {
-+ struct at803x_platform_data *pdata;
- int ret;
-
- ret = genphy_config_init(phydev);
-@@ -271,6 +287,26 @@ static int at803x_config_init(struct phy
- return ret;
- }
-
-+ pdata = dev_get_platdata(&phydev->mdio.dev);
-+ if (pdata) {
-+ if (pdata->disable_smarteee)
-+ at803x_disable_smarteee(phydev);
-+
-+ if (pdata->enable_rgmii_rx_delay)
-+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0,
-+ AT803X_DEBUG_RX_CLK_DLY_EN);
-+ else
-+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
-+ AT803X_DEBUG_RX_CLK_DLY_EN, 0);
-+
-+ if (pdata->enable_rgmii_tx_delay)
-+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
-+ AT803X_DEBUG_TX_CLK_DLY_EN);
-+ else
-+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
-+ AT803X_DEBUG_TX_CLK_DLY_EN, 0);
-+ }
-+
- return 0;
- }
-
-@@ -308,6 +344,8 @@ static int at803x_config_intr(struct phy
- static void at803x_link_change_notify(struct phy_device *phydev)
- {
- struct at803x_priv *priv = phydev->priv;
-+ struct at803x_platform_data *pdata;
-+ pdata = dev_get_platdata(&phydev->mdio.dev);
-
- /*
- * Conduct a hardware reset for AT8030/2 every time a link loss is
-@@ -336,6 +374,24 @@ static void at803x_link_change_notify(st
- } else {
- priv->phy_reset = false;
- }
-+ if (pdata && pdata->fixup_rgmii_tx_delay &&
-+ phydev->speed != priv->prev_speed) {
-+ switch (phydev->speed) {
-+ case SPEED_10:
-+ case SPEED_100:
-+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,
-+ AT803X_DEBUG_TX_CLK_DLY_EN);
-+ break;
-+ case SPEED_1000:
-+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
-+ AT803X_DEBUG_TX_CLK_DLY_EN, 0);
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ priv->prev_speed = phydev->speed;
-+ }
- }
-
- static int at803x_aneg_done(struct phy_device *phydev)
---- /dev/null
-+++ b/include/linux/platform_data/phy-at803x.h
-@@ -0,0 +1,11 @@
-+#ifndef _PHY_AT803X_PDATA_H
-+#define _PHY_AT803X_PDATA_H
-+
-+struct at803x_platform_data {
-+ int disable_smarteee:1;
-+ int enable_rgmii_tx_delay:1;
-+ int enable_rgmii_rx_delay:1;
-+ int fixup_rgmii_tx_delay:1;
-+};
-+
-+#endif /* _PHY_AT803X_PDATA_H */
diff --git a/target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch b/target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch
deleted file mode 100644
index 496700f377..0000000000
--- a/target/linux/generic/pending-4.19/736-net-phy-at803x-allow-to-configure-via-dt.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/drivers/net/phy/at803x.c
-+++ b/drivers/net/phy/at803x.c
-@@ -329,6 +329,14 @@ static int at803x_config_init(struct phy
- AT803X_DEBUG_TX_CLK_DLY_EN, 0);
- }
-
-+#ifdef CONFIG_OF_MDIO
-+ if (phydev->mdio.dev.of_node &&
-+ of_property_read_bool(phydev->mdio.dev.of_node,
-+ "at803x-disable-smarteee")) {
-+ at803x_disable_smarteee(phydev);
-+ }
-+#endif
-+
- return 0;
- }
-
-@@ -367,6 +375,7 @@ static void at803x_link_change_notify(st
- {
- struct at803x_priv *priv = phydev->priv;
- struct at803x_platform_data *pdata;
-+ u8 fixup_rgmii_tx_delay = 0;
- pdata = dev_get_platdata(&phydev->mdio.dev);
-
- /*
-@@ -396,8 +405,19 @@ static void at803x_link_change_notify(st
- } else {
- priv->phy_reset = false;
- }
-- if (pdata && pdata->fixup_rgmii_tx_delay &&
-- phydev->speed != priv->prev_speed) {
-+
-+ if (pdata && pdata->fixup_rgmii_tx_delay)
-+ fixup_rgmii_tx_delay = 1;
-+
-+#ifdef CONFIG_OF_MDIO
-+ if (phydev->mdio.dev.of_node &&
-+ of_property_read_bool(phydev->mdio.dev.of_node,
-+ "at803x-fixup-rgmii-tx-delay")) {
-+ fixup_rgmii_tx_delay = 1;
-+ }
-+#endif
-+
-+ if (fixup_rgmii_tx_delay && phydev->speed != priv->prev_speed) {
- switch (phydev->speed) {
- case SPEED_10:
- case SPEED_100: