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

Commit ba414431 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: enable PMIC device drivers for msm8953"

parents 4c43b81f 5fac9bed

arch/arm/configs/msm8953-perf_defconfig

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

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set

# CONFIG_VT is not set
@@ -300,9 +301,14 @@ CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y 
CONFIG_PINCTRL_MSM8953=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_GPIO_QPNP_PIN_DEBUG=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_TYPEC=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_THERMAL=y

CONFIG_THERMAL_QPNP=y
@@ -310,6 +316,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=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y
@@ -363,7 +370,10 @@ CONFIG_MMC_CQ_HCI=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_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

arch/arm/configs/msm8953_defconfig

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

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

# CONFIG_SERIO_SERPORT is not set

# CONFIG_VT is not set
@@ -310,9 +311,14 @@ CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y 
CONFIG_PINCTRL_MSM8953=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

CONFIG_GPIO_QPNP_PIN_DEBUG=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMBCHARGER=y

CONFIG_QPNP_TYPEC=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_THERMAL=y

CONFIG_THERMAL_QPNP=y
@@ -320,6 +326,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=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y
@@ -375,7 +382,10 @@ CONFIG_MMC_CQ_HCI=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_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

arch/arm64/configs/msm8953-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ CONFIG_LEDS_QPNP=y 
CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_WLED=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

arch/arm64/configs/msm8953_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ CONFIG_LEDS_QPNP=y 
CONFIG_LEDS_QPNP_FLASH=y

CONFIG_LEDS_QPNP_WLED=y

CONFIG_LEDS_QPNP_HAPTICS=y

CONFIG_LEDS_QPNP_VIBRATOR_LDO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y