summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-05-07 10:03:56 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-05-07 10:03:55 -0700
commit463cf733689568e014555ceeba83f2f0dcaacf5a (patch)
treecee151b3ff20be7461a84ae62aa82821ead08e96 /arch
parent371512066a6c9826a6f1ab67247d7c68c2dc8117 (diff)
parent1c11027786f78075f56792e5a04a90fd3d47bf5b (diff)
Merge "ARM: dts: msm: update mem region on msm8996 auto boards"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi14
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi13
2 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index b1de96051b00..2ab2d00de34b 100644
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -1584,3 +1584,17 @@
};
};
};
+
+/ {
+ qcom,sde-reserved-plane {
+ qcom,sde-plane-id@0 {
+ reg = <0x0>;
+ qcom,plane-name = "vig0";
+ };
+ };
+};
+
+&sde_kms {
+ contiguous-region = <&cont_splash_mem &cont_splash_mem_hdmi
+ &early_camera_mem>;
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index 7cbc09767f62..2702ddb23a43 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -1404,3 +1404,16 @@
};
};
+/ {
+ qcom,sde-reserved-plane {
+ qcom,sde-plane-id@0 {
+ reg = <0x0>;
+ qcom,plane-name = "vig0";
+ };
+ };
+};
+
+&sde_kms {
+ contiguous-region = <&cont_splash_mem &cont_splash_mem_hdmi
+ &early_camera_mem>;
+};