diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
| commit | 02629d8f87303a03e3ac36f48c508242d9b8cb09 (patch) | |
| tree | 250a83e0d0e2cf5c7fe49e0a2087f3739f4509c2 /target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch | |
| parent | 7be0ed78e7cf578aa89996d408703ea2ab79a1e8 (diff) | |
| download | mtk-20170518-02629d8f87303a03e3ac36f48c508242d9b8cb09.zip mtk-20170518-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.gz mtk-20170518-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.bz2 | |
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 42463
Diffstat (limited to 'target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch')
| -rw-r--r-- | target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch b/target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch index 6d322c7..3986d19 100644 --- a/target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch +++ b/target/linux/sunxi/patches-3.14/176-clk-sun5i-add-support-for-reset-ctrler.patch @@ -13,8 +13,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> drivers/clocksource/timer-sun5i.c | 6 ++++++ 2 files changed, 10 insertions(+) -diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt -index 7c26154..27cfc7d 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt +++ b/Documentation/devicetree/bindings/timer/allwinner,sun5i-a13-hstimer.txt @@ -9,6 +9,9 @@ Required properties: @@ -33,8 +31,6 @@ index 7c26154..27cfc7d 100644 clocks = <&ahb1_gates 19>; + resets = <&ahb1rst 19>; }; -diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c -index deebcd6..0226844 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -16,6 +16,7 @@ @@ -53,7 +49,7 @@ index deebcd6..0226844 100644 unsigned long rate; struct clk *clk; int ret, irq; -@@ -162,6 +164,10 @@ static void __init sun5i_timer_init(struct device_node *node) +@@ -162,6 +164,10 @@ static void __init sun5i_timer_init(stru clk_prepare_enable(clk); rate = clk_get_rate(clk); @@ -64,6 +60,3 @@ index deebcd6..0226844 100644 writel(~0, timer_base + TIMER_INTVAL_LO_REG(1)); writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD, timer_base + TIMER_CTL_REG(1)); --- -2.0.3 - |