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

Commit 5e79fac3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: clean up unused sa6155/sa8155/sa8195 configuration"

parents 9163a6bb 97124337

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

+3 −9
Original line number Diff line number Diff line
@@ -299,14 +299,12 @@ 
				 qcom,plane-name = "plane-4-splash";

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

				 qcom,plane-init-active;

				 qcom,plane-seamless-mode = "shared";

			 };

			 plane@1 {

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

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

				 qcom,plane-init-active;

				 qcom,plane-init-handoff;

				 qcom,plane-seamless-mode = "shared";

			 };

		 };

	 };
@@ -314,7 +312,7 @@ 
	sde_card1: qcom,sde-kms-lease@0 {

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

		   qcom,dev-name = "msm_drm";

		   qcom,lease-connectors = "DSI-2","DP-1","DP-2","DP-3";

		   qcom,lease-connectors = "shared-disp-0","DP-1","DP-2","DP-3";

		   qcom,lease-planes = "plane-0","plane-1","plane-2","plane-3",

					"plane-4", "plane-5", "plane-6",

					"plane-7","plane-8","plane-9";
@@ -322,22 +320,18 @@ 
	sde_card2: qcom,sde-kms-lease@1 {

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

		   qcom,dev-name = "msm_drm2";

		   qcom,lease-connectors = "DSI-4";

		   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 = "DSI-3";

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

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

	   };



};



&mdss_dsi_phy0 {

	qcom,panel-force-clock-lane-hs;

};



&mdss_mdp {

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

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

arch/arm64/boot/dts/qcom/sa8155-adp-star-display.dtsi

+4 −14
Original line number Diff line number Diff line
@@ -383,14 +383,12 @@ 
				 qcom,plane-name = "plane-4-splash";

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

				 qcom,plane-init-active;

				 qcom,plane-seamless-mode = "shared";

			 };

			 plane@1 {

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

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

				 qcom,plane-init-active;

				 qcom,plane-init-handoff;

				 qcom,plane-seamless-mode = "shared";

			 };

		 };

	 };
@@ -398,8 +396,8 @@ 
	sde_card1: qcom,sde-kms-lease@0 {

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

		   qcom,dev-name = "msm_drm";

		   qcom,lease-connectors = "DSI-2", "DSI-3", "DP-1", "DP-2",

						"DP-3";

		   qcom,lease-connectors = "DSI-2", "shared-disp-0",

					"DP-1", "DP-2", "DP-3";

		   qcom,lease-planes = "plane-0", "plane-1", "plane-2",

					"plane-3","plane-4", "plane-5",

					"plane-6","plane-7", "plane-8",
@@ -410,26 +408,18 @@ 
	sde_card2: qcom,sde-kms-lease@1 {

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

		   qcom,dev-name = "msm_drm2";

		   qcom,lease-connectors = "DSI-5";

		   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 = "DSI-4";

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

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

	   };



};



&mdss_dsi_phy0 {

	qcom,panel-force-clock-lane-hs;

};



&mdss_dsi_phy1 {

	qcom,panel-force-clock-lane-hs;

};



&mdss_mdp {

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

	connectors = <&sde_rscc &dsi_dp1 &dsi_dp2 &sde_dp &sde_wb>;

arch/arm64/boot/dts/qcom/sa8195p-adp-star-display.dtsi

+4 −14
Original line number Diff line number Diff line
@@ -370,14 +370,12 @@ 
				 qcom,plane-name = "plane-4-splash";

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

				 qcom,plane-init-active;

				 qcom,plane-seamless-mode = "shared";

			 };

			 plane@1 {

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

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

				 qcom,plane-init-active;

				 qcom,plane-init-handoff;

				 qcom,plane-seamless-mode = "shared";

			 };

		 };

	 };
@@ -385,8 +383,8 @@ 
	sde_card1: qcom,sde-kms-lease@0 {

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

		   qcom,dev-name = "msm_drm";

		   qcom,lease-connectors = "DSI-2", "DSI-3", "DP-1", "DP-2",

			   "DP-3";

		   qcom,lease-connectors = "DSI-2", "shared-disp-0",

				"DP-1", "DP-2", "DP-3";

		   qcom,lease-planes = "plane-0", "plane-1", "plane-2",

			   "plane-3","plane-4", "plane-5",

			   "plane-6","plane-7", "plane-8",
@@ -398,26 +396,18 @@ 
	sde_card2: qcom,sde-kms-lease@1 {

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

		   qcom,dev-name = "msm_drm2";

		   qcom,lease-connectors = "DSI-5";

		   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 = "DSI-4";

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

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

	   };

};



&mdss_dsi_phy0 {

	qcom,panel-force-clock-lane-hs;

};



&mdss_dsi_phy1 {

	qcom,panel-force-clock-lane-hs;

};



&mdss_mdp {

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

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

arch/arm64/configs/vendor/sa8155-perf_defconfig

+2 −8
Original line number Diff line number Diff line
@@ -399,19 +399,13 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_MSM_AIS=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_NPU=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_DVB_MPQ_TSPP1=y

CONFIG_TSPP=m

CONFIG_DRM=y

CONFIG_DRM_MSM_REGISTER_LOGGING=y

CONFIG_DRM_SDE_SHD=y

CONFIG_DRM_SDE_SHP=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

CONFIG_DRM_SDE_RSC=y

CONFIG_DRM_MSM_LEASE=y

# CONFIG_DRM_MSM is not set

CONFIG_DRM_ANALOGIX_ANX7625=y

CONFIG_FB_ARMCLCD=y

CONFIG_BACKLIGHT_QCOM_SPMI_WLED=y
@@ -518,7 +512,6 @@ CONFIG_RMNET_IPA3=y 
CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_MSM_11AD=m

CONFIG_QCOM_MDSS_PLL=y

CONFIG_SPMI_PMIC_CLKDIV=y

CONFIG_MSM_CLK_AOP_QMP=y

CONFIG_MSM_GCC_SM8150=y
@@ -581,6 +574,7 @@ CONFIG_MSM_PM=y 
CONFIG_QCOM_FSA4480_I2C=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_DRM_TECHPACK=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_DEVFREQ_GOV_PASSIVE=y

arch/arm64/configs/vendor/sa8155_defconfig

+2 −9
Original line number Diff line number Diff line
@@ -414,21 +414,14 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_MSM_AIS=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_MSM_NPU=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_DVB_MPQ_TSPP1=y

CONFIG_TSPP=m

CONFIG_DRM=y

CONFIG_DRM_MSM_REGISTER_LOGGING=y

# CONFIG_DRM_MSM is not set

# CONFIG_DSI_PARSER is not set

CONFIG_DRM_SDE_SHD=y

CONFIG_DRM_SDE_SHP=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

CONFIG_DRM_SDE_RSC=y

CONFIG_DRM_MSM_LEASE=y

CONFIG_DRM_ANALOGIX_ANX7625=y

CONFIG_FB_VIRTUAL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -544,7 +537,6 @@ CONFIG_RMNET_IPA3=y 
CONFIG_RNDIS_IPA=y

CONFIG_IPA_UT=y

CONFIG_MSM_11AD=m

CONFIG_QCOM_MDSS_PLL=y

CONFIG_SPMI_PMIC_CLKDIV=y

CONFIG_MSM_CLK_AOP_QMP=y

CONFIG_MSM_GCC_SM8150=y
@@ -614,6 +606,7 @@ CONFIG_MSM_PM=y 
CONFIG_QCOM_FSA4480_I2C=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_DRM_TECHPACK=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_QCOM_CDSP_RM=y

CONFIG_DEVFREQ_GOV_PASSIVE=y