aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-11-06 18:43:08 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-07 19:49:50 +0100
commit662fe6a6eeede98ef215284aeb5ff8256ee25f1d (patch)
tree9fcc62ee99d8756917bd291f43f2e7f5fb830d3f /target/linux/ar71xx
parent5e8b9624f1791d193e8d5e007ce4c873454f014a (diff)
downloadupstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.tar.gz
upstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.tar.bz2
upstream-662fe6a6eeede98ef215284aeb5ff8256ee25f1d.zip
kernel: bump 4.14 to 4.14.254
All updated automatically. Compile-tested on: malta/le, lantiq/xrx200 Runtime-tested on: malta/le, lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch b/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch
index 6b0d300023..5c76f6c92f 100644
--- a/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch
+++ b/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch
@@ -26,7 +26,7 @@
#endif /* __MDIO_BOARD_INFO_H */
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
-@@ -456,6 +456,17 @@ void mdiobus_free(struct mii_bus *bus)
+@@ -463,6 +463,17 @@ void mdiobus_free(struct mii_bus *bus)
}
EXPORT_SYMBOL(mdiobus_free);
@@ -44,7 +44,7 @@
/**
* mdiobus_scan - scan a bus for MDIO devices.
* @bus: mii_bus to scan
-@@ -471,6 +482,7 @@ EXPORT_SYMBOL(mdiobus_free);
+@@ -478,6 +489,7 @@ EXPORT_SYMBOL(mdiobus_free);
struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
{
struct phy_device *phydev;
@@ -52,7 +52,7 @@
int err;
phydev = get_phy_device(bus, addr, false);
-@@ -483,6 +495,12 @@ struct phy_device *mdiobus_scan(struct m
+@@ -490,6 +502,12 @@ struct phy_device *mdiobus_scan(struct m
*/
of_mdiobus_link_mdiodev(bus, &phydev->mdio);