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

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

Merge "defconfig: fsm9010: Enable thermal"

parents 615a97a9 f6fc01a9

arch/arm/configs/fsm9010-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ CONFIG_GPIO_QPNP_PIN_DEBUG=y 
CONFIG_POWER_SUPPLY=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_SENSORS_QPNP_ADC_CURRENT=y

CONFIG_THERMAL=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_STUB=y

CONFIG_REGULATOR_QPNP=y

arch/arm/configs/fsm9010_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_GPIO_QPNP_PIN_DEBUG=y 
CONFIG_POWER_SUPPLY=y

CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y

CONFIG_SENSORS_QPNP_ADC_CURRENT=y

CONFIG_THERMAL=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_STUB=y

CONFIG_REGULATOR_QPNP=y

drivers/hwmon/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ config SENSORS_EPM_ADC 


config SENSORS_QPNP_ADC_VOLTAGE

	tristate "Support for Qualcomm QPNP Voltage ADC"

	depends on SPMI

	depends on SPMI && THERMAL

	help

	  This is the VADC arbiter driver for Qualcomm QPNP ADC Chip.