diff options
author | Etienne Haarsma <bladeoner112@gmail.com> | 2018-04-28 21:51:24 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2018-04-30 08:00:27 +0200 |
commit | 81573ea259247f1c6c1a7a490de174d0a6c48a64 (patch) | |
tree | 9dc8bb798d93cd52d2a47b3d699581bd2d69c78c /target/linux/apm821xx | |
parent | afa8873887664bbf42c8e7914dc572da2d3bcb79 (diff) | |
download | upstream-81573ea259247f1c6c1a7a490de174d0a6c48a64.tar.gz upstream-81573ea259247f1c6c1a7a490de174d0a6c48a64.tar.bz2 upstream-81573ea259247f1c6c1a7a490de174d0a6c48a64.zip |
kernel: bump kernel 4.4 to 4.4.129 for 17.01
* Refreshed patches
Compile-tested: ar71xx
Run-tested: ar71xx
Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
Diffstat (limited to 'target/linux/apm821xx')
-rw-r--r-- | target/linux/apm821xx/patches-4.4/701-powerpc_ibm_apm82181_phyclk_fix.patch | 2 | ||||
-rw-r--r-- | target/linux/apm821xx/patches-4.4/702-powerpc_ibm_phy_add_dt_parser.patch | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/apm821xx/patches-4.4/701-powerpc_ibm_apm82181_phyclk_fix.patch b/target/linux/apm821xx/patches-4.4/701-powerpc_ibm_apm82181_phyclk_fix.patch index 011e785e99..3849645c28 100644 --- a/target/linux/apm821xx/patches-4.4/701-powerpc_ibm_apm82181_phyclk_fix.patch +++ b/target/linux/apm821xx/patches-4.4/701-powerpc_ibm_apm82181_phyclk_fix.patch @@ -30,7 +30,7 @@ #endif } -@@ -2587,7 +2596,7 @@ static int emac_init_config(struct emac_ +@@ -2605,7 +2614,7 @@ static int emac_init_config(struct emac_ if (of_device_is_compatible(np, "ibm,emac-apm821xx")) { dev->features |= (EMAC_APM821XX_REQ_JUMBO_FRAME_SIZE | EMAC_FTR_APM821XX_NO_HALF_DUPLEX | diff --git a/target/linux/apm821xx/patches-4.4/702-powerpc_ibm_phy_add_dt_parser.patch b/target/linux/apm821xx/patches-4.4/702-powerpc_ibm_phy_add_dt_parser.patch index c84e761ed0..17efe08f95 100644 --- a/target/linux/apm821xx/patches-4.4/702-powerpc_ibm_phy_add_dt_parser.patch +++ b/target/linux/apm821xx/patches-4.4/702-powerpc_ibm_phy_add_dt_parser.patch @@ -18,7 +18,7 @@ Subject: [PATCH] phy device tree support for emac #include <linux/slab.h> #include <asm/processor.h> -@@ -2392,6 +2393,246 @@ static int emac_read_uint_prop(struct de +@@ -2410,6 +2411,246 @@ static int emac_read_uint_prop(struct de return 0; } @@ -265,7 +265,7 @@ Subject: [PATCH] phy device tree support for emac static int emac_init_phy(struct emac_instance *dev) { struct device_node *np = dev->ofdev->dev.of_node; -@@ -2462,6 +2703,18 @@ static int emac_init_phy(struct emac_ins +@@ -2480,6 +2721,18 @@ static int emac_init_phy(struct emac_ins emac_configure(dev); @@ -284,7 +284,7 @@ Subject: [PATCH] phy device tree support for emac if (dev->phy_address != 0xffffffff) phy_map = ~(1 << dev->phy_address); -@@ -2489,6 +2742,7 @@ static int emac_init_phy(struct emac_ins +@@ -2507,6 +2760,7 @@ static int emac_init_phy(struct emac_ins return -ENXIO; } @@ -292,7 +292,7 @@ Subject: [PATCH] phy device tree support for emac /* Init PHY */ if (dev->phy.def->ops->init) dev->phy.def->ops->init(&dev->phy); -@@ -2907,6 +3161,8 @@ static int emac_probe(struct platform_de +@@ -2925,6 +3179,8 @@ static int emac_probe(struct platform_de /* I have a bad feeling about this ... */ err_detach_tah: @@ -301,7 +301,7 @@ Subject: [PATCH] phy device tree support for emac if (emac_has_feature(dev, EMAC_FTR_HAS_TAH)) tah_detach(dev->tah_dev, dev->tah_port); err_detach_rgmii: -@@ -2957,6 +3213,11 @@ static int emac_remove(struct platform_d +@@ -2975,6 +3231,11 @@ static int emac_remove(struct platform_d if (emac_has_feature(dev, EMAC_FTR_HAS_ZMII)) zmii_detach(dev->zmii_dev, dev->zmii_port); |