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

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

Merge "defconfig: Enable PMIC and SPMI MFD drivers for msm8953"

parents 995449d3 95cd3d08

arch/arm64/configs/msm8953-perf_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ CONFIG_INPUT_JOYSTICK=y 
CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set

# CONFIG_VT is not set
@@ -302,10 +303,16 @@ CONFIG_PINCTRL_MSM8953=y 
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_GPIO_QPNP_PIN_DEBUG=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_MSM_APM=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_THERMAL=y
@@ -314,6 +321,7 @@ CONFIG_THERMAL_QPNP_ADC_TM=y 
CONFIG_THERMAL_TSENS=y

CONFIG_MSM_BCL_PERIPHERAL_CTL=y

CONFIG_QTI_THERMAL_LIMITS_DCVS=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_CPR4_APSS=y

CONFIG_REGULATOR_CPRH_KBSS=y
@@ -378,7 +386,9 @@ CONFIG_MMC_SDHCI_MSM=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_WLED=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

arch/arm64/configs/msm8953_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ CONFIG_INPUT_JOYSTICK=y 
CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set

# CONFIG_VT is not set
@@ -312,10 +313,16 @@ CONFIG_PINCTRL_MSM8953=y 
CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_GPIO_QPNP_PIN_DEBUG=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_MSM_APM=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_THERMAL=y
@@ -324,6 +331,7 @@ CONFIG_THERMAL_QPNP_ADC_TM=y 
CONFIG_THERMAL_TSENS=y

CONFIG_MSM_BCL_PERIPHERAL_CTL=y

CONFIG_QTI_THERMAL_LIMITS_DCVS=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_CPR4_APSS=y

CONFIG_REGULATOR_CPRH_KBSS=y
@@ -390,7 +398,9 @@ CONFIG_MMC_SDHCI_MSM=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_WLED=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y