kernel/3.18: update to version 3.18.25
[openwrt/openwrt.git] / target / linux / sunxi / patches-4.4 / 102-dt-sun7i-add-dram-gates.patch
1 From 0b4bf5a5200b9ac5ddf545665f171feb5594677d Mon Sep 17 00:00:00 2001
2 From: Chen-Yu Tsai <wens@csie.org>
3 Date: Sat, 5 Dec 2015 21:16:46 +0800
4 Subject: [PATCH] ARM: dts: sun7i: Add DRAM gates
5
6 The DRAM gates controls direct memory access for some peripherals.
7 These peripherals include the display pipeline, so add the required
8 gates to the simplefb nodes as well.
9
10 Signed-off-by: Chen-Yu Tsai <wens@csie.org>
11 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
12 ---
13 arch/arm/boot/dts/sun7i-a20.dtsi | 32 +++++++++++++++++++++++++++++---
14 1 file changed, 29 insertions(+), 3 deletions(-)
15
16 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
17 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
18 @@ -68,7 +68,7 @@
19 "simple-framebuffer";
20 allwinner,pipeline = "de_be0-lcd0-hdmi";
21 clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>,
22 - <&ahb_gates 44>;
23 + <&ahb_gates 44>, <&dram_gates 26>;
24 status = "disabled";
25 };
26
27 @@ -76,7 +76,8 @@
28 compatible = "allwinner,simple-framebuffer",
29 "simple-framebuffer";
30 allwinner,pipeline = "de_be0-lcd0";
31 - clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
32 + clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>,
33 + <&dram_gates 26>;
34 status = "disabled";
35 };
36
37 @@ -85,7 +86,7 @@
38 "simple-framebuffer";
39 allwinner,pipeline = "de_be0-lcd0-tve0";
40 clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
41 - <&ahb_gates 44>;
42 + <&ahb_gates 44>, <&dram_gates 26>;
43 status = "disabled";
44 };
45 };
46 @@ -501,6 +502,31 @@
47 clock-output-names = "spi3";
48 };
49
50 + dram_gates: clk@01c20100 {
51 + #clock-cells = <1>;
52 + compatible = "allwinner,sun4i-a10-dram-gates-clk";
53 + reg = <0x01c20100 0x4>;
54 + clocks = <&pll5 0>;
55 + clock-indices = <0>,
56 + <1>, <2>,
57 + <3>,
58 + <4>,
59 + <5>, <6>,
60 + <15>,
61 + <24>, <25>,
62 + <26>, <27>,
63 + <28>, <29>;
64 + clock-output-names = "dram_ve",
65 + "dram_csi0", "dram_csi1",
66 + "dram_ts",
67 + "dram_tvd",
68 + "dram_tve0", "dram_tve1",
69 + "dram_output",
70 + "dram_de_fe1", "dram_de_fe0",
71 + "dram_de_be0", "dram_de_be1",
72 + "dram_de_mp", "dram_ace";
73 + };
74 +
75 codec_clk: clk@01c20140 {
76 #clock-cells = <0>;
77 compatible = "allwinner,sun4i-a10-codec-clk";