summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorAdrian Salido-Moreno <adrianm@codeaurora.org>2016-02-25 16:46:00 -0800
committerKyle Yan <kyan@codeaurora.org>2016-04-28 16:41:45 -0700
commit663f4f2bbcdf277f105f048473ce9229f3815cb4 (patch)
tree4e317b2f60da95d70e9c7853e3272ff9c25e1ee8 /arch/arm
parentdec6b85c91753f3e112b6ec27b7248e11d006e45 (diff)
ARM: dts: msm: add additional mdss dma pipes to msmcobalt
msmcobalt supports more DMA pipes, update mdss device node with these. CRs-Fixed: 987777 Change-Id: I764e75bcb73b9db8c9c3615b601ae465dcc4beac Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi19
1 files changed, 13 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi
index 18374dbf1d87..8233ab92d980 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi
@@ -56,11 +56,12 @@
qcom,mdss-pipe-vig-off = <0x00005000 0x00007000
0x00009000 0x0000b000>;
- qcom,mdss-pipe-dma-off = <0x00025000 0x00027000>;
+ qcom,mdss-pipe-dma-off = <0x00025000 0x00027000
+ 0x00029000 0x0002b000>;
qcom,mdss-pipe-cursor-off = <0x00035000 0x00037000>;
qcom,mdss-pipe-vig-xin-id = <0 4 8 12>;
- qcom,mdss-pipe-dma-xin-id = <1 5>;
+ qcom,mdss-pipe-dma-xin-id = <1 5 9 13>;
qcom,mdss-pipe-cursor-xin-id = <2 10>;
/* These Offsets are relative to
@@ -70,8 +71,10 @@
<0x2b4 0 0>,
<0x2bc 0 0>,
<0x2c4 0 0>;
- qcom,mdss-pipe-dma-clk-ctrl-offsets = <0x2ac 8 12>,
- <0x2b4 8 12>;
+ qcom,mdss-pipe-dma-clk-ctrl-offsets = <0x2ac 8 12>,
+ <0x2b4 8 12>,
+ <0x2c4 8 12>,
+ <0x2c4 12 14>;
qcom,mdss-pipe-cursor-clk-ctrl-offsets = <0x3a8 16 15>,
<0x3b0 16 15>;
@@ -101,6 +104,7 @@
clocks = <&clock_mmss clk_mmss_mdss_ahb_clk>,
<&clock_mmss clk_mmss_mdss_axi_clk>,
<&clock_mmss clk_mdp_clk_src>,
+ <&clock_mmss clk_mmss_mdss_mdp_clk>,
<&clock_mmss clk_mmss_mdss_vsync_clk>;
clock-names = "iface_clk", "bus_clk", "core_clk_src",
"core_clk", "vsync_clk";
@@ -119,8 +123,10 @@
<0x09200 0x09230>,
<0x0b000 0x0b150>,
<0x0b200 0x0b230>,
- <0x25000 0x25150>,
- <0x27000 0x27150>,
+ <0x25000 0x25184>,
+ <0x27000 0x27184>,
+ <0x29000 0x29184>,
+ <0x2b000 0x2b184>,
<0x35000 0x35150>,
<0x37000 0x37150>,
<0x45000 0x452bc>,
@@ -147,6 +153,7 @@
"VIG0_SSPP", "VIG0", "VIG1_SSPP", "VIG1",
"VIG2_SSPP", "VIG2", "VIG3_SSPP", "VIG3",
"DMA0_SSPP", "DMA1_SSPP",
+ "DMA2_SSPP", "DMA3_SSPP",
"CURSOR0_SSPP", "CURSOR1_SSPP",
"LAYER_0", "LAYER_1", "LAYER_2",
"LAYER_3", "LAYER_4", "LAYER_5",