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

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

Merge "defconfig: msm8937/53: enable SMB1355 charger driver" into msm-4.9

parents 7e91fccd 47002170

arch/arm/configs/msm8937-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ CONFIG_POWER_RESET_SYSCON=y 
CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y
@@ -374,6 +375,7 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y 
CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_QTI_BCL_PMIC5=y

CONFIG_QTI_BCL_SOC_DRIVER=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -584,6 +586,7 @@ CONFIG_DEVFREQ_SIMPLE_DEV=y 
CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_PWM_QTI_LPG=y

arch/arm/configs/msm8937_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ CONFIG_POWER_RESET_SYSCON=y 
CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y
@@ -381,6 +382,7 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y 
CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_QTI_BCL_PMIC5=y

CONFIG_QTI_BCL_SOC_DRIVER=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -603,6 +605,7 @@ CONFIG_DEVFREQ_SIMPLE_DEV=y 
CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_PWM_QTI_LPG=y

arch/arm/configs/msm8953-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ CONFIG_POWER_RESET_SYSCON=y 
CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y
@@ -370,6 +371,7 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y 
CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_QTI_BCL_PMIC5=y

CONFIG_QTI_BCL_SOC_DRIVER=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -586,6 +588,7 @@ CONFIG_DEVFREQ_SIMPLE_DEV=y 
CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_PWM_QTI_LPG=y

arch/arm/configs/msm8953_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ CONFIG_POWER_RESET_SYSCON=y 
CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMBCHARGER=y
@@ -377,6 +378,7 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y 
CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_QTI_BCL_PMIC5=y

CONFIG_QTI_BCL_SOC_DRIVER=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -604,6 +606,7 @@ CONFIG_DEVFREQ_SIMPLE_DEV=y 
CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_SPDM_SCM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_PWM_QTI_LPG=y