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

Commit 4bacef7b authored by Zhiqiang Liu's avatar Zhiqiang Liu Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: move SHD & multi-card related config to a separate file 



Move the shared display / shared plane / multiple cards / connector list
related device tree descriptions to a separate file. This will make the
device tree for other usage scenarios much simpler.

Change-Id: I9a3737d1a363a9e48bc5427032df54922e1fe1af
Signed-off-by: default avatarZhiqiang Liu <zhiqliu@codeaurora.org>
parent e9e01580

arch/arm64/boot/dts/qcom/sa6155-adp-air-overlay.dts

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, 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
@@ -16,6 +16,7 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sa6155-adp-air.dtsi"

#include "sa6155-display-shd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155 ADP-AIR";

arch/arm64/boot/dts/qcom/sa6155-adp-star-overlay.dts

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, 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
@@ -16,6 +16,7 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sa6155-adp-star.dtsi"

#include "sa6155-display-shd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155 ADP-STAR";

arch/arm64/boot/dts/qcom/sa6155-display-shd.dtsi

0 → 100644
+83 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2019-2020, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	sde_sh_base0: qcom,shared-display-base@0 {

		qcom,shared-display-base-intf = <1>;

	};



	sde_sh0: qcom,shared-display@0 {

		compatible = "qcom,shared-display";

		qcom,shared-display-base = <&sde_sh_base0>;

		qcom,blend-stage-range = <0 6>;

		qcom,shared-display-name = "shared-disp-0";

		qcom,display-type = "primary";

	};



	sde_sh1: qcom,shared-display@1 {

		compatible = "qcom,shared-display";

		qcom,shared-display-base = <&sde_sh_base0>;

		qcom,blend-stage-range = <6 1>;

		qcom,shared-display-name = "shared-disp-1";

	};



	sde_sh2: qcom,shared-display@2 {

		compatible = "qcom,shared-display";

		qcom,shared-display-base = <&sde_sh_base0>;

		qcom,blend-stage-range = <7 1>;

		qcom,shared-display-name = "shared-disp-2";

	};



	sde_shp: qcom,sde-shared-plane {

		compatible = "qcom,sde-shared-plane";

		qcom,add-planes {

			plane@0 {

				qcom,plane-name = "plane-4-splash";

				qcom,plane-parent = "plane-4";

				qcom,plane-init-active;

			};

			plane@1 {

				qcom,plane-name = "plane-3-splash";

				qcom,plane-parent = "plane-3";

				qcom,plane-init-active;

				qcom,plane-init-handoff;

			};

		};

	};



	sde_card1: qcom,sde-kms-lease@0 {

		compatible = "qcom,sde-kms-lease";

		qcom,dev-name = "msm_drm";

	};



	sde_card2: qcom,sde-kms-lease@1 {

		compatible = "qcom,sde-kms-lease";

		qcom,dev-name = "msm_drm2";

		qcom,lease-connectors = "shared-disp-2";

		qcom,lease-planes = "plane-4-splash";

	};



	sde_card3: qcom,sde-kms-lease@2 {

		compatible = "qcom,sde-kms-lease";

		qcom,dev-name = "msm_drm3";

		qcom,lease-connectors = "shared-disp-1";

		qcom,lease-planes = "plane-3-splash";

	};

};



&mdss_mdp {

	qcom,sde-reg-dma-version = <0>;

	qcom,sde-crtc-num-pref = <5>;

	connectors = <&dsi_dp1 &sde_wb &sde_dp

			&sde_sh0 &sde_sh1 &sde_sh2 &sde_shp

			&sde_card1 &sde_card2 &sde_card3>;

};

arch/arm64/boot/dts/qcom/sa6155-display.dtsi

+0 −67
Original line number Diff line number Diff line
@@ -221,77 +221,10 @@ 
	qcom,rmnet-ipa {

		status="disabled";

	};



	sde_sh_base0: qcom,shared-display-base@0 {

		qcom,shared-display-base-intf = <1>;

	};



	sde_sh0: qcom,shared-display@0 {

		compatible = "qcom,shared-display";

		qcom,shared-display-base = <&sde_sh_base0>;

		qcom,blend-stage-range = <0 6>;

		qcom,shared-display-name = "shared-disp-0";

		qcom,display-type = "primary";

	};



	sde_sh1: qcom,shared-display@1 {

		compatible = "qcom,shared-display";

		qcom,shared-display-base = <&sde_sh_base0>;

		qcom,blend-stage-range = <6 1>;

		qcom,shared-display-name = "shared-disp-1";

	};



	sde_sh2: qcom,shared-display@2 {

		compatible = "qcom,shared-display";

		qcom,shared-display-base = <&sde_sh_base0>;

		qcom,blend-stage-range = <7 1>;

		qcom,shared-display-name = "shared-disp-2";

	};



	sde_shp: qcom,sde-shared-plane {

		compatible = "qcom,sde-shared-plane";

		qcom,add-planes {

			plane@0 {

				qcom,plane-name = "plane-4-splash";

				qcom,plane-parent = "plane-4";

				qcom,plane-init-active;

			};

			plane@1 {

				qcom,plane-name = "plane-3-splash";

				qcom,plane-parent = "plane-3";

				qcom,plane-init-active;

				qcom,plane-init-handoff;

			};

		};

	};



	sde_card1: qcom,sde-kms-lease@0 {

		compatible = "qcom,sde-kms-lease";

		qcom,dev-name = "msm_drm";

	};



	sde_card2: qcom,sde-kms-lease@1 {

		compatible = "qcom,sde-kms-lease";

		qcom,dev-name = "msm_drm2";

		qcom,lease-connectors = "shared-disp-2";

		qcom,lease-planes = "plane-4-splash";

	};



	sde_card3: qcom,sde-kms-lease@2 {

		compatible = "qcom,sde-kms-lease";

		qcom,dev-name = "msm_drm3";

		qcom,lease-connectors = "shared-disp-1";

		qcom,lease-planes = "plane-3-splash";

	};

};



&mdss_mdp {

	sde-vdd-supply = <&mdss_core_gdsc>;

	qcom,sde-reg-dma-version = <0>;

	qcom,sde-crtc-num-pref = <5>;

	connectors = <&dsi_dp1 &sde_wb &sde_dp

			&sde_sh0 &sde_sh1 &sde_sh2 &sde_shp

			&sde_card1 &sde_card2 &sde_card3>;

	qcom,platform-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm64/boot/dts/qcom/sa6155p-adp-air-overlay.dts

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, 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
@@ -17,6 +17,7 @@ 
#include <dt-bindings/clock/qcom,camcc-sm6150.h>



#include "sa6155-adp-air.dtsi"

#include "sa6155-display-shd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR";