diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-07 23:22:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-07 23:22:38 -0700 |
| commit | 438e42ee1d297524e41624f03786f66dfb5d105d (patch) | |
| tree | 038fd258be568bb152786a13e6c1814fb4944ac8 /arch/arm | |
| parent | 28352998dee80f33641dd7b28479350bd480b823 (diff) | |
| parent | 03f57a4a98166c03ffc919999bb8009cb07bd7ad (diff) | |
Merge "ARM: dts: msm: add proxy vote for mdss gdsc for msmcobalt"
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt.dtsi | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi index 0242497c3747..b87c42e520d1 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-mdss.dtsi @@ -255,6 +255,9 @@ mdss_fb0: qcom,mdss_fb_primary { cell-index = <0>; compatible = "qcom,mdss-fb"; + qcom,cont-splash-memory { + linux,contiguous-region = <&cont_splash_mem>; + }; }; mdss_fb1: qcom,mdss_fb_wfd { diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index b8735096796e..c9a2abf0d5b5 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -333,6 +333,11 @@ size = <0 0x2000000>; linux,cma-default; }; + + cont_splash_mem: splash_region@9d600000 { + reg = <0x0 0x9d600000 0x0 0x02400000>; + label = "cont_splash_mem"; + }; }; }; @@ -2886,6 +2891,8 @@ clock-names = "bus_clk", "rot_clk"; clocks = <&clock_mmss clk_mmss_mdss_axi_clk>, <&clock_mmss clk_mmss_mdss_rot_clk>; + proxy-supply = <&gdsc_mdss>; + qcom,proxy-consumer-enable; status = "ok"; }; |