kernel: remove duplicate #define's in at803x Ethernet PHY driver
authorDaniel Golle <daniel@makrotopia.org>
Tue, 31 Jul 2018 03:17:52 +0000 (05:17 +0200)
committerDaniel Golle <daniel@makrotopia.org>
Tue, 31 Jul 2018 03:42:35 +0000 (05:42 +0200)
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>
(cherry picked from commit 67fcff6aaf)

target/linux/generic/pending-4.14/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch

index 9a2f93a..381b2d0 100644 (file)
@@ -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
  
-@@ -292,6 +296,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;
index 485567c..381b2d0 100644 (file)
@@ -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
  
-@@ -295,6 +299,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;