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

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

Merge changes I057d472b,I2bdbd0c2 into msm-4.14 

* changes:
  ARM: dts: msm: add pinctrl information of display for SDMSHRIKE
  defconfig: sdmshrike: enable compilation of SDE display driver
parents b3341f29 2b96185e

arch/arm64/boot/dts/qcom/sdmshrike-pinctrl.dtsi

+55 −0
Original line number Diff line number Diff line
@@ -533,6 +533,61 @@ 
			};

		};



		pmx_sde: pmx_sde {

			sde_dsi_active: sde_dsi_active {

				mux {

					pins = "gpio6", "gpio7";

					function = "gpio";

				};



				config {

					pins = "gpio6", "gpio7";

					drive-strength = <8>;   /* 8 mA */

					bias-disable = <0>;   /* no pull */

				};

			};

			sde_dsi_suspend: sde_dsi_suspend {

				mux {

					pins = "gpio6", "gpio7";

					function = "gpio";

				};



				config {

					pins = "gpio6", "gpio7";

					drive-strength = <2>;   /* 2 mA */

					bias-pull-down;         /* PULL DOWN */

				};

			};

		};



		pmx_sde_te {

			sde_te_active: sde_te_active {

				mux {

					pins = "gpio8";

					function = "mdp_vsync";

				};



				config {

					pins = "gpio8";

					drive-strength = <2>;   /* 2 mA */

					bias-pull-down;         /* PULL DOWN */

				};

			};



			sde_te_suspend: sde_te_suspend {

				mux {

					pins = "gpio8";

					function = "mdp_vsync";

				};



				config {

					pins = "gpio8";

					drive-strength = <2>;   /* 2 mA */

					bias-pull-down;         /* PULL DOWN */

				};

			};

		};



		sec_tdm {

			sec_tdm_sleep: sec_tdm_sleep {

				mux {

arch/arm64/configs/sdmshrike-perf_defconfig

+7 −4
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ CONFIG_THERMAL=y 
CONFIG_QCOM_SPMI_TEMP_ALARM=y

CONFIG_THERMAL_TSENS=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_REFGEN=y
@@ -278,7 +277,12 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_FB=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_DRM=y

CONFIG_DRM_MSM_REGISTER_LOGGING=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

CONFIG_DRM_SDE_RSC=y

CONFIG_FB_ARMCLCD=y

CONFIG_BACKLIGHT_QCOM_SPMI_WLED=y

CONFIG_LOGO=y
@@ -347,6 +351,7 @@ CONFIG_ASHMEM=y 
CONFIG_ION=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QPNP_REVID=y

CONFIG_QCOM_MDSS_PLL=y

CONFIG_SPMI_PMIC_CLKDIV=y

CONFIG_MSM_CLK_AOP_QMP=y

CONFIG_MSM_NPUCC_SM8150=y
@@ -368,7 +373,6 @@ CONFIG_QCOM_LLCC=y 
CONFIG_QCOM_SDMSHRIKE_LLCC=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QCOM_SMP2P=y
@@ -399,7 +403,6 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_ECRYPT_FS=y

CONFIG_ECRYPT_FS_MESSAGING=y

arch/arm64/configs/sdmshrike_defconfig

+7 −4
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ CONFIG_THERMAL=y 
CONFIG_QCOM_SPMI_TEMP_ALARM=y

CONFIG_THERMAL_TSENS=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_REFGEN=y
@@ -288,7 +287,12 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_FB=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_DRM=y

CONFIG_DRM_MSM_REGISTER_LOGGING=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

CONFIG_DRM_SDE_RSC=y

CONFIG_FB_VIRTUAL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -360,6 +364,7 @@ CONFIG_ASHMEM=y 
CONFIG_ION=y

CONFIG_QCOM_GENI_SE=y

CONFIG_QPNP_REVID=y

CONFIG_QCOM_MDSS_PLL=y

CONFIG_SPMI_PMIC_CLKDIV=y

CONFIG_MSM_CLK_AOP_QMP=y

CONFIG_MSM_NPUCC_SM8150=y
@@ -381,7 +386,6 @@ CONFIG_QCOM_LLCC=y 
CONFIG_QCOM_SDMSHRIKE_LLCC=y

CONFIG_QCOM_QMI_HELPERS=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QCOM_WDOG_IPI_ENABLE=y
@@ -415,7 +419,6 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_EFIVAR_FS=y

CONFIG_ECRYPT_FS=y