summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-23 04:04:10 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-23 04:04:10 -0800
commit96a84f78bedda3dbfa33ff00e509f064c883bd26 (patch)
tree24e13eca73102cf1ee12e9808d5c9e8692b0c392
parentb2664632f0213ba84d9eec797f4fe08a148b402d (diff)
parent0f87e7ba0306e319083f01b6a34b895618c60bc9 (diff)
Merge "ARM: dts: msm: Enable continuous splash on sdm660"
-rw-r--r--arch/arm/boot/dts/qcom/sdm660-mdss.dtsi5
-rw-r--r--arch/arm/boot/dts/qcom/sdm660.dtsi5
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm660-mdss.dtsi b/arch/arm/boot/dts/qcom/sdm660-mdss.dtsi
index ec14815a4be6..344ec0d7177b 100644
--- a/arch/arm/boot/dts/qcom/sdm660-mdss.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660-mdss.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -245,6 +245,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/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi
index 772a7ff0a868..26e08666cbec 100644
--- a/arch/arm/boot/dts/qcom/sdm660.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660.dtsi
@@ -343,6 +343,11 @@
size = <0 0x2000000>;
linux,cma-default;
};
+
+ cont_splash_mem: splash_region@9d400000 {
+ reg = <0x0 0x9d400000 0x0 0x02400000>;
+ label = "cont_splash_mem";
+ };
};
bluetooth: bt_wcn3990 {