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

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

Merge "defconfig: msm: disable POWER_RESET_SYSCON for MSM8953"

parents 561c4bc8 b10fae2a

arch/arm/configs/msm8953-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,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
@@ -374,6 +373,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_PROXY_CONSUMER=y

arch/arm/configs/msm8953_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,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
@@ -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_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