From: Hauke Mehrtens Date: Sun, 28 Dec 2014 19:31:40 +0000 (+0000) Subject: ipq806x: refresh patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f22aeccdd294a4ee5245ed6082d448595b70225d;p=openwrt%2Fstaging%2Fynezz.git ipq806x: refresh patches This makes the patchs apply again. Signed-off-by: Hauke Mehrtens SVN-Revision: 43792 --- diff --git a/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch b/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch index dc0408c166..25b6ac2a38 100644 --- a/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch +++ b/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch @@ -522,7 +522,7 @@ Signed-off-by: Kumar Gala #include "clk-regmap.h" #include "clk-pll.h" #include "clk-rcg.h" -@@ -2222,85 +2223,28 @@ static const struct regmap_config mmcc_m +@@ -2224,85 +2225,28 @@ static const struct regmap_config mmcc_m .fast_io = true, }; diff --git a/target/linux/ipq806x/patches/0109-libahci-Allow-drivers-to-override-start_engine.patch b/target/linux/ipq806x/patches/0109-libahci-Allow-drivers-to-override-start_engine.patch index b727e2693e..aa2fee6ed3 100644 --- a/target/linux/ipq806x/patches/0109-libahci-Allow-drivers-to-override-start_engine.patch +++ b/target/linux/ipq806x/patches/0109-libahci-Allow-drivers-to-override-start_engine.patch @@ -23,7 +23,7 @@ Signed-off-by: Tejun Heo --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c -@@ -583,6 +583,7 @@ static int ahci_vt8251_hardreset(struct +@@ -606,6 +606,7 @@ static int ahci_vt8251_hardreset(struct unsigned long deadline) { struct ata_port *ap = link->ap; @@ -31,7 +31,7 @@ Signed-off-by: Tejun Heo bool online; int rc; -@@ -593,7 +594,7 @@ static int ahci_vt8251_hardreset(struct +@@ -616,7 +617,7 @@ static int ahci_vt8251_hardreset(struct rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), deadline, &online, NULL); @@ -40,7 +40,7 @@ Signed-off-by: Tejun Heo DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class); -@@ -608,6 +609,7 @@ static int ahci_p5wdh_hardreset(struct a +@@ -631,6 +632,7 @@ static int ahci_p5wdh_hardreset(struct a { struct ata_port *ap = link->ap; struct ahci_port_priv *pp = ap->private_data; @@ -48,7 +48,7 @@ Signed-off-by: Tejun Heo u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; struct ata_taskfile tf; bool online; -@@ -623,7 +625,7 @@ static int ahci_p5wdh_hardreset(struct a +@@ -646,7 +648,7 @@ static int ahci_p5wdh_hardreset(struct a rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), deadline, &online, NULL); diff --git a/target/linux/ipq806x/patches/0124-ata-move-library-code-from-ahci_platform.c-to-libahc.patch b/target/linux/ipq806x/patches/0124-ata-move-library-code-from-ahci_platform.c-to-libahc.patch index d35b1dc950..eca606b150 100644 --- a/target/linux/ipq806x/patches/0124-ata-move-library-code-from-ahci_platform.c-to-libahc.patch +++ b/target/linux/ipq806x/patches/0124-ata-move-library-code-from-ahci_platform.c-to-libahc.patch @@ -25,7 +25,7 @@ Conflicts: --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -99,7 +99,7 @@ config SATA_AHCI_PLATFORM +@@ -115,7 +115,7 @@ config SATA_AHCI_PLATFORM config AHCI_IMX tristate "Freescale i.MX AHCI SATA support" diff --git a/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch b/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch index 4ee9350180..a78319ff52 100644 --- a/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch +++ b/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch @@ -93,7 +93,7 @@ Signed-off-by: Stephen Boyd fail_clk = clk; } -@@ -1499,7 +1539,8 @@ static void clk_change_rate(struct clk * +@@ -1500,7 +1540,8 @@ static void clk_change_rate(struct clk * else if (clk->parent) best_parent_rate = clk->parent->rate; @@ -103,17 +103,17 @@ Signed-off-by: Stephen Boyd old_parent = __clk_set_parent_before(clk, clk->new_parent); if (clk->ops->set_rate_and_parent) { -@@ -1522,9 +1563,6 @@ static void clk_change_rate(struct clk * +@@ -1523,9 +1564,6 @@ static void clk_change_rate(struct clk * else clk->rate = best_parent_rate; - if (clk->notifier_count && old_rate != clk->rate) - __clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate); - - hlist_for_each_entry(child, &clk->children, child_node) { - /* Skip children who will be reparented to another clock */ - if (child->new_parent && child->new_parent != clk) -@@ -1598,6 +1636,7 @@ int clk_set_rate(struct clk *clk, unsign + /* + * Use safe iteration, as change_rate can actually swap parents + * for certain clock types. +@@ -1603,6 +1641,7 @@ int clk_set_rate(struct clk *clk, unsign /* change the rates */ clk_change_rate(top); diff --git a/target/linux/ipq806x/patches/0128-clk-qcom-Add-support-for-banked-MD-RCGs.patch b/target/linux/ipq806x/patches/0128-clk-qcom-Add-support-for-banked-MD-RCGs.patch index b55d709381..38104b95d0 100644 --- a/target/linux/ipq806x/patches/0128-clk-qcom-Add-support-for-banked-MD-RCGs.patch +++ b/target/linux/ipq806x/patches/0128-clk-qcom-Add-support-for-banked-MD-RCGs.patch @@ -230,7 +230,7 @@ Signed-off-by: Stephen Boyd --- a/drivers/clk/qcom/mmcc-msm8960.c +++ b/drivers/clk/qcom/mmcc-msm8960.c -@@ -726,9 +726,11 @@ static struct freq_tbl clk_tbl_gfx2d[] = +@@ -728,9 +728,11 @@ static struct freq_tbl clk_tbl_gfx2d[] = }; static struct clk_dyn_rcg gfx2d0_src = { @@ -243,7 +243,7 @@ Signed-off-by: Stephen Boyd .mn[0] = { .mnctr_en_bit = 8, .mnctr_reset_bit = 25, -@@ -784,9 +786,11 @@ static struct clk_branch gfx2d0_clk = { +@@ -786,9 +788,11 @@ static struct clk_branch gfx2d0_clk = { }; static struct clk_dyn_rcg gfx2d1_src = { @@ -256,7 +256,7 @@ Signed-off-by: Stephen Boyd .mn[0] = { .mnctr_en_bit = 8, .mnctr_reset_bit = 25, -@@ -862,9 +866,11 @@ static struct freq_tbl clk_tbl_gfx3d[] = +@@ -864,9 +868,11 @@ static struct freq_tbl clk_tbl_gfx3d[] = }; static struct clk_dyn_rcg gfx3d_src = { @@ -269,7 +269,7 @@ Signed-off-by: Stephen Boyd .mn[0] = { .mnctr_en_bit = 8, .mnctr_reset_bit = 25, -@@ -1051,9 +1057,11 @@ static struct freq_tbl clk_tbl_mdp[] = { +@@ -1053,9 +1059,11 @@ static struct freq_tbl clk_tbl_mdp[] = { }; static struct clk_dyn_rcg mdp_src = { @@ -282,7 +282,7 @@ Signed-off-by: Stephen Boyd .mn[0] = { .mnctr_en_bit = 8, .mnctr_reset_bit = 31, -@@ -1158,7 +1166,9 @@ static struct freq_tbl clk_tbl_rot[] = { +@@ -1160,7 +1168,9 @@ static struct freq_tbl clk_tbl_rot[] = { }; static struct clk_dyn_rcg rot_src = { @@ -293,7 +293,7 @@ Signed-off-by: Stephen Boyd .p[0] = { .pre_div_shift = 22, .pre_div_width = 4, -@@ -1355,9 +1365,11 @@ static struct freq_tbl clk_tbl_vcodec[] +@@ -1357,9 +1367,11 @@ static struct freq_tbl clk_tbl_vcodec[] }; static struct clk_dyn_rcg vcodec_src = { diff --git a/target/linux/ipq806x/patches/0142-ata-Add-Qualcomm-ARM-SoC-AHCI-SATA-host-controller-d.patch b/target/linux/ipq806x/patches/0142-ata-Add-Qualcomm-ARM-SoC-AHCI-SATA-host-controller-d.patch index aaedbb374b..5db5d9d69b 100644 --- a/target/linux/ipq806x/patches/0142-ata-Add-Qualcomm-ARM-SoC-AHCI-SATA-host-controller-d.patch +++ b/target/linux/ipq806x/patches/0142-ata-Add-Qualcomm-ARM-SoC-AHCI-SATA-host-controller-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Kumar Gala --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig -@@ -106,6 +106,16 @@ config AHCI_IMX +@@ -122,6 +122,16 @@ config AHCI_IMX If unsure, say N. diff --git a/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch b/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch index cde3d2a8dd..76956d5b9b 100644 --- a/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch +++ b/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch @@ -20,7 +20,7 @@ Signed-off-by: Mike Turquette --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -2502,7 +2502,7 @@ EXPORT_SYMBOL_GPL(of_clk_del_provider); +@@ -2507,7 +2507,7 @@ EXPORT_SYMBOL_GPL(of_clk_del_provider); struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec) { struct of_clk_provider *provider;