aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-22 11:22:30 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-22 13:47:13 +0200
commit6b4ba118ac1ba1318182eb3a22864e86165f0b09 (patch)
tree4f47188239e811ae1a9ea924e2871e0726a7aff3 /target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
parent7a9afb8783d60e16308f98efb59907aec0fdd5f7 (diff)
downloadupstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.tar.gz
upstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.tar.bz2
upstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.zip
kernel: bump 4.14 to 4.14.66
Refreshed all patches Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch')
-rw-r--r--target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch b/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
index 7822158cf2..81de68c9cb 100644
--- a/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
+++ b/target/linux/ar71xx/patches-4.14/902-at803x-add-reset-gpio-pdata.patch
@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif /* _PHY_AT803X_PDATA_H */
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -261,6 +261,7 @@ static int at803x_resume(struct phy_devi
+@@ -259,6 +259,7 @@ static int at803x_resume(struct phy_devi
static int at803x_probe(struct phy_device *phydev)
{
@@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct device *dev = &phydev->mdio.dev;
struct at803x_priv *priv;
struct gpio_desc *gpiod_reset;
-@@ -273,6 +274,12 @@ static int at803x_probe(struct phy_devic
+@@ -271,6 +272,12 @@ static int at803x_probe(struct phy_devic
phydev->drv->phy_id != ATH8032_PHY_ID)
goto does_not_require_reset_workaround;
@@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(gpiod_reset))
return PTR_ERR(gpiod_reset);
-@@ -404,15 +411,23 @@ static void at803x_link_change_notify(st
+@@ -411,15 +418,23 @@ static void at803x_link_change_notify(st
* cannot recover from by software.
*/
if (phydev->state == PHY_NOLINK) {