mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
215c1d05b8
Bump the 17.01 tree kernel to 4.4.69. Trunk 4.4 and 17.01 4.4 have diverged, talked this through with jow, he was okay with a clean diff against 17.01 and not a backported trunk patch. The following patches were applied upstream: * 062-[1-6]-MIPS-* series * 042-0004-mtd-bcm47xxpart-fix-parsing-first-block Reintroduced lantiq/patches-4.4/0050-MIPS-Lantiq-Fix-cascaded-IRQ-setup, as it was incorrectly included upstream thus dropped from LEDE, but subsequently reverted upstream. Thanks to Kevin Darbyshire-Bryant for pointing me to it. Compile-tested on: ar71xx, ramips/mt7621, x86/64. Run-tested on: ar71xx, ramips/mt7621, x86/64. Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 6d3a47c29186aa8d26ff05a6209c94291ace0696 Mon Sep 17 00:00:00 2001
|
|
From: Chen-Yu Tsai <wens@csie.org>
|
|
Date: Sat, 5 Dec 2015 21:16:42 +0800
|
|
Subject: [PATCH] clk: sunxi: Add DRAM gates support for sun4i-a10
|
|
|
|
The A10/A20 share the same set of DRAM clock gates, which controls
|
|
direct memory access for some peripherals.
|
|
|
|
On the A10, bit 15 controls the system's DRAM clock output (possibly
|
|
to the DRAM chips), which we need to keep on.
|
|
|
|
On the A20 this has been moved to the DRAM controller, becoming a no-op.
|
|
However it is still listed in the user manual, so add it anyway.
|
|
|
|
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
---
|
|
Documentation/devicetree/bindings/clock/sunxi.txt | 1 +
|
|
drivers/clk/sunxi/clk-simple-gates.c | 12 ++++++++++++
|
|
2 files changed, 13 insertions(+)
|
|
|
|
--- a/drivers/clk/sunxi/clk-simple-gates.c
|
|
+++ b/drivers/clk/sunxi/clk-simple-gates.c
|
|
@@ -160,3 +160,15 @@ CLK_OF_DECLARE(sun5i_a13_ahb, "allwinner
|
|
sun4i_a10_ahb_init);
|
|
CLK_OF_DECLARE(sun7i_a20_ahb, "allwinner,sun7i-a20-ahb-gates-clk",
|
|
sun4i_a10_ahb_init);
|
|
+
|
|
+static const int sun4i_a10_dram_critical_clocks[] __initconst = {
|
|
+ 15, /* dram_output */
|
|
+};
|
|
+
|
|
+static void __init sun4i_a10_dram_init(struct device_node *node)
|
|
+{
|
|
+ sunxi_simple_gates_setup(node, sun4i_a10_dram_critical_clocks,
|
|
+ ARRAY_SIZE(sun4i_a10_dram_critical_clocks));
|
|
+}
|
|
+CLK_OF_DECLARE(sun4i_a10_dram, "allwinner,sun4i-a10-dram-gates-clk",
|
|
+ sun4i_a10_dram_init);
|