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

Commit 7cb7a4a7 authored Oct 23, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Oct 23, 2018

Merge "defconfig: msm: enable POWER_RESET_SYSCON for MSM8909"

parents 6d79b6a5 d3e58b38

arch/arm/configs/msm8909-perf_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -285,6 +285,8 @@ CONFIG_GPIO_SYSFS=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_QCOM=y
		CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_POWER_RESET_SYSCON_POWEROFF=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_SMB1360_CHARGER_FG=y
		CONFIG_QPNP_VM_BMS=y
		@@ -304,7 +306,6 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y
		CONFIG_REGULATOR_COOLING_DEVICE=y
		CONFIG_MFD_QCOM_RPM=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/msm8909_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -307,6 +307,8 @@ CONFIG_GPIO_SYSFS=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_QCOM=y
		CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_POWER_RESET_SYSCON_POWEROFF=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_SMB1360_CHARGER_FG=y
		CONFIG_QPNP_VM_BMS=y
		@@ -327,7 +329,6 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y
		CONFIG_REGULATOR_COOLING_DEVICE=y
		CONFIG_MFD_QCOM_RPM=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_MFD_SYSCON=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_PROXY_CONSUMER=y