Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96a84f78 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable continuous splash on sdm660"

parents b2664632 0f87e7ba

arch/arm/boot/dts/qcom/sdm660-mdss.dtsi

+4 −1
Original line number Diff line number Diff line 
/* 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 {

arch/arm/boot/dts/qcom/sdm660.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -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 {