From f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 2 Dec 2015 21:52:41 +0000 Subject: kernel: update 4.1 to 4.1.13 - two upstreamed patches removed - compile tested all targets using 4.1 - run tested ar71xx Signed-off-by: Roman Yeryomin Signed-off-by: Hauke Mehrtens SVN-Revision: 47694 --- .../0003-clk-mediatek-Add-reset-controller-support.patch | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'target/linux/mediatek/patches/0003-clk-mediatek-Add-reset-controller-support.patch') diff --git a/target/linux/mediatek/patches/0003-clk-mediatek-Add-reset-controller-support.patch b/target/linux/mediatek/patches/0003-clk-mediatek-Add-reset-controller-support.patch index bb6f64b..d54cb34 100644 --- a/target/linux/mediatek/patches/0003-clk-mediatek-Add-reset-controller-support.patch +++ b/target/linux/mediatek/patches/0003-clk-mediatek-Add-reset-controller-support.patch @@ -21,18 +21,14 @@ Acked-by: Philipp Zabel 3 files changed, 108 insertions(+) create mode 100644 drivers/clk/mediatek/reset.c -diff --git a/drivers/clk/mediatek/Makefile b/drivers/clk/mediatek/Makefile -index c384e97..0b6f1c3 100644 --- a/drivers/clk/mediatek/Makefile +++ b/drivers/clk/mediatek/Makefile @@ -1 +1,2 @@ obj-y += clk-mtk.o clk-pll.o clk-gate.o +obj-$(CONFIG_RESET_CONTROLLER) += reset.o -diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h -index 694fc39..61035b9 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h -@@ -156,4 +156,14 @@ void __init mtk_clk_register_plls(struct device_node *node, +@@ -156,4 +156,14 @@ void __init mtk_clk_register_plls(struct const struct mtk_pll_data *plls, int num_plls, struct clk_onecell_data *clk_data); @@ -47,9 +43,6 @@ index 694fc39..61035b9 100644 +#endif + #endif /* __DRV_CLK_MTK_H */ -diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c -new file mode 100644 -index 0000000..9e9fe4b --- /dev/null +++ b/drivers/clk/mediatek/reset.c @@ -0,0 +1,97 @@ @@ -150,6 +143,3 @@ index 0000000..9e9fe4b + return; + } +} --- -1.7.10.4 - -- cgit v1.1