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

Commit b10fae2a authored May 30, 2018 by Jingbiao Lu

defconfig: msm: disable POWER_RESET_SYSCON for MSM8953



POWER_RESET_SYSCON select MFD_SYSCON in msm-3.18 and is not
required in msm-4.9. But MFD_SYSCON is required for audio
system in msm-4.9. So disable POWER_RESET_SYSCON and enable
MFD_SYSCON.

Change-Id: I41dc2ed74bd16536cb5c6421fd28a1a585366f3c
Signed-off-by: Jingbiao Lu <jingbiao@codeaurora.org>

parent 63098a4e

arch/arm/configs/msm8953-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -345,7 +345,6 @@ CONFIG_GPIO_QPNP_PIN=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_QCOM=y
		CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_QPNP_FG=y
		CONFIG_SMB135X_CHARGER=y
		@@ -371,6 +370,7 @@ CONFIG_REGULATOR_COOLING_DEVICE=y
		CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_MFD_SYSCON=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_PROXY_CONSUMER=y

arch/arm/configs/msm8953_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -352,7 +352,6 @@ CONFIG_GPIO_QPNP_PIN=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_QCOM=y
		CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_QPNP_FG=y
		CONFIG_SMB135X_CHARGER=y
		@@ -378,6 +377,7 @@ CONFIG_REGULATOR_COOLING_DEVICE=y
		CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_MFD_SYSCON=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_PROXY_CONSUMER=y

arch/arm64/configs/msm8953-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -345,7 +345,6 @@ CONFIG_GPIO_SYSFS=y
		CONFIG_GPIO_QPNP_PIN=y
		CONFIG_POWER_RESET_QCOM=y
		CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_QPNP_FG=y
		CONFIG_SMB135X_CHARGER=y
		CONFIG_SMB1355_SLAVE_CHARGER=y
		@@ -372,6 +371,7 @@ CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_MFD_I2C_PMIC=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_MFD_SYSCON=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_CPR=y

arch/arm64/configs/msm8953_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,6 @@ CONFIG_GPIO_SYSFS=y
		CONFIG_GPIO_QPNP_PIN=y
		CONFIG_POWER_RESET_QCOM=y
		CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_QPNP_FG=y
		CONFIG_SMB135X_CHARGER=y
		CONFIG_SMB1355_SLAVE_CHARGER=y
		@@ -381,6 +380,7 @@ CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_MFD_I2C_PMIC=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_MFD_SYSCON=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_CPR=y