From e5441232a81d01e2ed46d88e340a30fd6b15b012 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Wed, 10 Sep 2014 21:40:19 +0000 Subject: kernel: update 3.14 to 3.14.18 Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../182-clk-sunxi-add-support-for-usb-clockreg-reset.patch | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch') diff --git a/target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch b/target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch index 533b6013f1..e8977362c7 100644 --- a/target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch +++ b/target/linux/sunxi/patches-3.14/182-clk-sunxi-add-support-for-usb-clockreg-reset.patch @@ -18,8 +18,6 @@ Signed-off-by: Emilio López drivers/clk/sunxi/clk-sunxi.c | 71 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) -diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c -index 736fb60..23beb6e 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -18,6 +18,7 @@ @@ -30,7 +28,7 @@ index 736fb60..23beb6e 100644 #include "clk-factors.h" -@@ -688,6 +689,59 @@ static void __init sunxi_divider_clk_setup(struct device_node *node, +@@ -688,6 +689,59 @@ static void __init sunxi_divider_clk_set /** @@ -90,7 +88,7 @@ index 736fb60..23beb6e 100644 * sunxi_gates_clk_setup() - Setup function for leaf gates on clocks */ -@@ -695,6 +749,7 @@ static void __init sunxi_divider_clk_setup(struct device_node *node, +@@ -695,6 +749,7 @@ static void __init sunxi_divider_clk_set struct gates_data { DECLARE_BITMAP(mask, SUNXI_GATES_MAX_SIZE); @@ -98,7 +96,7 @@ index 736fb60..23beb6e 100644 }; static const struct gates_data sun4i_axi_gates_data __initconst = { -@@ -765,6 +820,7 @@ static void __init sunxi_gates_clk_setup(struct device_node *node, +@@ -765,6 +820,7 @@ static void __init sunxi_gates_clk_setup struct gates_data *data) { struct clk_onecell_data *clk_data; @@ -106,7 +104,7 @@ index 736fb60..23beb6e 100644 const char *clk_parent; const char *clk_name; void *reg; -@@ -808,6 +864,21 @@ static void __init sunxi_gates_clk_setup(struct device_node *node, +@@ -808,6 +864,21 @@ static void __init sunxi_gates_clk_setup clk_data->clk_num = i; of_clk_add_provider(node, of_clk_src_onecell_get, clk_data); @@ -128,6 +126,3 @@ index 736fb60..23beb6e 100644 } --- -2.0.3 - -- cgit v1.2.3