aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-10-27 22:55:39 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-10-27 22:55:39 +0000
commit2644af4717cf9cc3cf89564ca017f596a7dcad05 (patch)
tree7f2121f700446e60159a365094fdc6eea16d5cb7 /target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch
parent5e558fcd48c8c4acb87fe7bcf3eb2a66bb279503 (diff)
downloadmaster-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.gz
master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.tar.bz2
master-187ad058-2644af4717cf9cc3cf89564ca017f596a7dcad05.zip
kernel: make the kernel 3.18 patches apply and boot on arm.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43095 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch')
-rw-r--r--target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch
index 91ae12630a..cc3cb2445d 100644
--- a/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch
+++ b/target/linux/generic/patches-3.18/710-phy-add-mdio_register_board_info.patch
@@ -9,7 +9,7 @@
/**
* mdiobus_alloc_size - allocate a mii_bus structure
* @size: extra amount of memory to allocate for private storage.
-@@ -224,15 +226,33 @@ void mdiobus_free(struct mii_bus *bus)
+@@ -335,9 +337,21 @@ void mdiobus_free(struct mii_bus *bus)
}
EXPORT_SYMBOL(mdiobus_free);
@@ -31,8 +31,9 @@
int err;
phydev = get_phy_device(bus, addr, false);
- if (IS_ERR(phydev) || phydev == NULL)
- return phydev;
+@@ -350,6 +364,12 @@ struct phy_device *mdiobus_scan(struct m
+ */
+ of_mdiobus_link_phydev(bus, phydev);
+ mutex_lock(&__mdio_board_lock);
+ list_for_each_entry(be, &__mdio_board_list, list)
@@ -45,7 +46,7 @@
phy_device_free(phydev);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -667,4 +667,22 @@ int __init mdio_bus_init(void);
+@@ -785,4 +785,22 @@ int __init mdio_bus_init(void);
void mdio_bus_exit(void);
extern struct bus_type mdio_bus_type;