mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
ipq807x: refresh 5.10 patches (#9376)
Remove target/linux/ipq807x/patches-5.10/100-clk-qcom-ipq8074-fix-PCI-E-clock-oops.patch
This commit is contained in:
parent
3efcb21ecc
commit
77625481a6
@ -1,88 +0,0 @@
|
|||||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
|
||||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
|
||||||
@@ -60,6 +60,11 @@ static const struct parent_map gcc_xo_gp
|
|
||||||
{ P_GPLL0_DIV2, 4 },
|
|
||||||
};
|
|
||||||
|
|
||||||
+static const char * const gcc_xo_gpll0[] = {
|
|
||||||
+ "xo",
|
|
||||||
+ "gpll0",
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static const struct parent_map gcc_xo_gpll0_map[] = {
|
|
||||||
{ P_XO, 0 },
|
|
||||||
{ P_GPLL0, 1 },
|
|
||||||
@@ -951,11 +956,6 @@ static struct clk_rcg2 blsp1_uart6_apps_
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
-static const struct clk_parent_data gcc_xo_gpll0[] = {
|
|
||||||
- { .fw_name = "xo" },
|
|
||||||
- { .hw = &gpll0.clkr.hw },
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
static const struct freq_tbl ftbl_pcie_axi_clk_src[] = {
|
|
||||||
F(19200000, P_XO, 1, 0, 0),
|
|
||||||
F(200000000, P_GPLL0, 4, 0, 0),
|
|
||||||
@@ -969,7 +969,7 @@ static struct clk_rcg2 pcie0_axi_clk_src
|
|
||||||
.parent_map = gcc_xo_gpll0_map,
|
|
||||||
.clkr.hw.init = &(struct clk_init_data){
|
|
||||||
.name = "pcie0_axi_clk_src",
|
|
||||||
- .parent_data = gcc_xo_gpll0,
|
|
||||||
+ .parent_names = gcc_xo_gpll0,
|
|
||||||
.num_parents = 2,
|
|
||||||
.ops = &clk_rcg2_ops,
|
|
||||||
},
|
|
||||||
@@ -1016,7 +1016,7 @@ static struct clk_rcg2 pcie1_axi_clk_src
|
|
||||||
.parent_map = gcc_xo_gpll0_map,
|
|
||||||
.clkr.hw.init = &(struct clk_init_data){
|
|
||||||
.name = "pcie1_axi_clk_src",
|
|
||||||
- .parent_data = gcc_xo_gpll0,
|
|
||||||
+ .parent_names = gcc_xo_gpll0,
|
|
||||||
.num_parents = 2,
|
|
||||||
.ops = &clk_rcg2_ops,
|
|
||||||
},
|
|
||||||
@@ -1330,7 +1330,7 @@ static struct clk_rcg2 nss_ce_clk_src =
|
|
||||||
.parent_map = gcc_xo_gpll0_map,
|
|
||||||
.clkr.hw.init = &(struct clk_init_data){
|
|
||||||
.name = "nss_ce_clk_src",
|
|
||||||
- .parent_data = gcc_xo_gpll0,
|
|
||||||
+ .parent_names = gcc_xo_gpll0,
|
|
||||||
.num_parents = 2,
|
|
||||||
.ops = &clk_rcg2_ops,
|
|
||||||
},
|
|
||||||
@@ -4329,7 +4329,7 @@ static struct clk_rcg2 pcie0_rchng_clk_s
|
|
||||||
.parent_map = gcc_xo_gpll0_map,
|
|
||||||
.clkr.hw.init = &(struct clk_init_data){
|
|
||||||
.name = "pcie0_rchng_clk_src",
|
|
||||||
- .parent_data = gcc_xo_gpll0,
|
|
||||||
+ .parent_names = gcc_xo_gpll0,
|
|
||||||
.num_parents = 2,
|
|
||||||
.ops = &clk_rcg2_ops,
|
|
||||||
},
|
|
||||||
@@ -4343,9 +4343,9 @@ static struct clk_branch gcc_pcie0_rchng
|
|
||||||
.enable_mask = BIT(1),
|
|
||||||
.hw.init = &(struct clk_init_data){
|
|
||||||
.name = "gcc_pcie0_rchng_clk",
|
|
||||||
- .parent_hws = (const struct clk_hw *[]){
|
|
||||||
- &pcie0_rchng_clk_src.clkr.hw,
|
|
||||||
- },
|
|
||||||
+ .parent_names = (const char *[]){
|
|
||||||
+ "pcie0_rchng_clk_src",
|
|
||||||
+ },
|
|
||||||
.num_parents = 1,
|
|
||||||
.flags = CLK_SET_RATE_PARENT,
|
|
||||||
.ops = &clk_branch2_ops,
|
|
||||||
@@ -4361,9 +4361,9 @@ static struct clk_branch gcc_pcie0_axi_s
|
|
||||||
.enable_mask = BIT(0),
|
|
||||||
.hw.init = &(struct clk_init_data){
|
|
||||||
.name = "gcc_pcie0_axi_s_bridge_clk",
|
|
||||||
- .parent_hws = (const struct clk_hw *[]){
|
|
||||||
- &pcie0_axi_clk_src.clkr.hw,
|
|
||||||
- },
|
|
||||||
+ .parent_names = (const char *[]){
|
|
||||||
+ "pcie0_axi_clk_src"
|
|
||||||
+ },
|
|
||||||
.num_parents = 1,
|
|
||||||
.flags = CLK_SET_RATE_PARENT,
|
|
||||||
.ops = &clk_branch2_ops,
|
|
@ -20,8 +20,8 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
|
|||||||
|
|
||||||
+#include <linux/clk.h>
|
+#include <linux/clk.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/io.h>
|
||||||
#include <linux/module.h>
|
#include <linux/iopoll.h>
|
||||||
@@ -33,6 +34,7 @@
|
@@ -33,6 +34,7 @@
|
||||||
|
|
||||||
struct ipq4019_mdio_data {
|
struct ipq4019_mdio_data {
|
||||||
|
@ -14,7 +14,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
|||||||
|
|
||||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||||
@@ -396,6 +396,22 @@ static const struct parent_map gcc_xo_gp
|
@@ -391,6 +391,22 @@ static const struct parent_map gcc_xo_gp
|
||||||
{ P_SLEEP_CLK, 6 },
|
{ P_SLEEP_CLK, 6 },
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -120,7 +120,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
|||||||
+ .parent_map = gcc_xo_gpll0_map,
|
+ .parent_map = gcc_xo_gpll0_map,
|
||||||
+ .clkr.hw.init = &(struct clk_init_data){
|
+ .clkr.hw.init = &(struct clk_init_data){
|
||||||
+ .name = "adss_pwm_clk_src",
|
+ .name = "adss_pwm_clk_src",
|
||||||
+ .parent_names = gcc_xo_gpll0,
|
+ .parent_data = gcc_xo_gpll0,
|
||||||
+ .num_parents = 2,
|
+ .num_parents = 2,
|
||||||
+ .ops = &clk_rcg2_ops,
|
+ .ops = &clk_rcg2_ops,
|
||||||
+ },
|
+ },
|
||||||
|
@ -21,7 +21,7 @@ Change-Id: I61fab902375716272ad9c426ce71581058f7bd35
|
|||||||
|
|
||||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||||
@@ -683,6 +683,7 @@ static struct clk_branch gcc_sleep_clk_s
|
@@ -678,6 +678,7 @@ static struct clk_branch gcc_sleep_clk_s
|
||||||
},
|
},
|
||||||
.num_parents = 1,
|
.num_parents = 1,
|
||||||
.ops = &clk_branch2_ops,
|
.ops = &clk_branch2_ops,
|
||||||
|
@ -668,7 +668,7 @@
|
|||||||
const struct in6_addr *daddr)
|
const struct in6_addr *daddr)
|
||||||
--- a/net/ipv6/route.c
|
--- a/net/ipv6/route.c
|
||||||
+++ b/net/ipv6/route.c
|
+++ b/net/ipv6/route.c
|
||||||
@@ -3767,6 +3767,9 @@ out_free:
|
@@ -3768,6 +3768,9 @@ out_free:
|
||||||
return ERR_PTR(err);
|
return ERR_PTR(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -678,7 +678,7 @@
|
|||||||
int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags,
|
int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags,
|
||||||
struct netlink_ext_ack *extack)
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
@@ -3778,6 +3781,10 @@ int ip6_route_add(struct fib6_config *cf
|
@@ -3779,6 +3782,10 @@ int ip6_route_add(struct fib6_config *cf
|
||||||
return PTR_ERR(rt);
|
return PTR_ERR(rt);
|
||||||
|
|
||||||
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
|
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
|
||||||
@ -689,7 +689,7 @@
|
|||||||
fib6_info_release(rt);
|
fib6_info_release(rt);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
@@ -3799,6 +3806,9 @@ static int __ip6_del_rt(struct fib6_info
|
@@ -3800,6 +3807,9 @@ static int __ip6_del_rt(struct fib6_info
|
||||||
err = fib6_del(rt, info);
|
err = fib6_del(rt, info);
|
||||||
spin_unlock_bh(&table->tb6_lock);
|
spin_unlock_bh(&table->tb6_lock);
|
||||||
|
|
||||||
@ -699,7 +699,7 @@
|
|||||||
out:
|
out:
|
||||||
fib6_info_release(rt);
|
fib6_info_release(rt);
|
||||||
return err;
|
return err;
|
||||||
@@ -6179,6 +6189,20 @@ static int ip6_route_dev_notify(struct n
|
@@ -6180,6 +6190,20 @@ static int ip6_route_dev_notify(struct n
|
||||||
return NOTIFY_OK;
|
return NOTIFY_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ Change-Id: Ic5da1551bf46921890955312026b9175a42fe14e
|
|||||||
|
|
||||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||||
@@ -648,6 +648,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
|
@@ -643,6 +643,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
|
||||||
.freq_tbl = ftbl_pcnoc_bfdcd_clk_src,
|
.freq_tbl = ftbl_pcnoc_bfdcd_clk_src,
|
||||||
.hid_width = 5,
|
.hid_width = 5,
|
||||||
.parent_map = gcc_xo_gpll0_gpll0_out_main_div2_map,
|
.parent_map = gcc_xo_gpll0_gpll0_out_main_div2_map,
|
||||||
|
Loading…
Reference in New Issue
Block a user