aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2018-07-31 05:17:52 +0200
committerDaniel Golle <daniel@makrotopia.org>2018-07-31 05:28:48 +0200
commit7dcdf162225ae0392a68488ab31a15fc2f20608d (patch)
tree131ef9b5c10b2ce25ac02c281f769c7453cc88fd /target/linux/generic/pending-4.14
parenta497e4776207fc4da2369735df51c137f85a425b (diff)
downloadupstream-7dcdf162225ae0392a68488ab31a15fc2f20608d.tar.gz
upstream-7dcdf162225ae0392a68488ab31a15fc2f20608d.tar.bz2
upstream-7dcdf162225ae0392a68488ab31a15fc2f20608d.zip
kernel: remove duplicate #define's in at803x Ethernet PHY driver
AT803X_REG_CHIP_CONFIG and AT803X_BT_BX_REG_SEL have been defined upstream by commit f62265b53ef3 ("at803x: double check SGMII side autoneg") An existing local patch then added those exact same defines again which isn't necessary, so remove them. Fixes: f791fb4af450 ("kernel: add linux 4.9 support") Fixes: b3f95490b9be ("kernel: generic: Add kernel 4.14 support") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic/pending-4.14')
-rw-r--r--target/linux/generic/pending-4.14/735-net-phy-at803x-fix-at8033-sgmii-mode.patch17
1 files changed, 7 insertions, 10 deletions
diff --git a/target/linux/generic/pending-4.14/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/generic/pending-4.14/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
index 1f689850bd..381b2d09fa 100644
--- a/target/linux/generic/pending-4.14/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
+++ b/target/linux/generic/pending-4.14/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
@@ -13,18 +13,15 @@ Signed-off-by: Roman Yeryomin <roman@advem.lv>
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -55,6 +55,10 @@
- #define AT803X_DEBUG_ADDR 0x1D
- #define AT803X_DEBUG_DATA 0x1E
-
-+#define AT803X_REG_CHIP_CONFIG 0x1f
-+#define AT803X_BT_BX_REG_SEL 0x8000
+@@ -46,6 +46,7 @@
+ #define AT803X_FUNC_DATA 0x4003
+ #define AT803X_REG_CHIP_CONFIG 0x1f
+ #define AT803X_BT_BX_REG_SEL 0x8000
+#define AT803X_SGMII_ANEG_EN 0x1000
-+
- #define AT803X_MODE_CFG_MASK 0x0F
- #define AT803X_MODE_CFG_SGMII 0x01
-@@ -293,6 +297,27 @@ static int at803x_config_init(struct phy
+ #define AT803X_PCS_SMART_EEE_CTRL3 0x805D
+ #define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3
+@@ -295,6 +296,27 @@ static int at803x_config_init(struct phy
{
struct at803x_platform_data *pdata;
int ret;