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

Commit d29fb689 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 missing regulator drivers on perf defconfig"

parents 51b1841e 25a12065

arch/arm64/configs/msm-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -293,7 +293,10 @@ CONFIG_WCD9330_CODEC=y 
CONFIG_WCD9335_CODEC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_STUB=y

CONFIG_REGULATOR_FAN53555=y

CONFIG_REGULATOR_MEM_ACC=y

CONFIG_REGULATOR_RPM_SMD=y

CONFIG_REGULATOR_QPNP=y

CONFIG_REGULATOR_QPNP_LABIBB=y

arch/arm64/configs/msm_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -295,16 +295,16 @@ CONFIG_WCD9330_CODEC=y 
CONFIG_WCD9335_CODEC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_STUB=y

CONFIG_REGULATOR_FAN53555=y

CONFIG_REGULATOR_MEM_ACC=y

CONFIG_REGULATOR_RPM_SMD=y

CONFIG_REGULATOR_QPNP=y

CONFIG_REGULATOR_QPNP_LABIBB=y

CONFIG_REGULATOR_SPM=y

CONFIG_REGULATOR_CPR3_HMSS=y

CONFIG_REGULATOR_CPR3_MMSS=y

CONFIG_REGULATOR_STUB=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_MEM_ACC=y

CONFIG_REGULATOR_KRYO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

drivers/regulator/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,16 @@ config REGULATOR_USERSPACE_CONSUMER 


	  If unsure, say no.



config REGULATOR_PROXY_CONSUMER

	bool "Boot time regulator proxy consumer support"

	help

	  This driver provides support for boot time regulator proxy requests.

	  It can enforce a specified voltage range, set a minimum current,

	  and/or keep a regulator enabled.  It is needed in circumstances where

	  reducing one or more of these three quantities will cause hardware to

	  stop working if performed before the driver managing the hardware has

	  probed.



config REGULATOR_88PM800

	tristate "Marvell 88PM800 Power regulators"

	depends on MFD_88PM800