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

Commit 2a4f8114 authored by Jacek Anaszewski's avatar Jacek Anaszewski
Browse files

Merge tag 'ib-mfd-arm-leds-v4.10' of... 

Merge tag 'ib-mfd-arm-leds-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into linux-leds/for-next

Pull PM8XXX namespace cleanup from Lee Jones.

* tag 'ib-mfd-arm-leds-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: qcom-pm8xxx: Clean up PM8XXX namespace
parents eb1610b4 40a3a0f2

arch/arm/configs/multi_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ CONFIG_MFD_MAX8907=y 
CONFIG_MFD_MAX8997=y

CONFIG_MFD_MAX8998=y

CONFIG_MFD_RK808=y

CONFIG_MFD_PM8921_CORE=y

CONFIG_MFD_PM8XXX=y

CONFIG_MFD_QCOM_RPM=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_MFD_SEC_CORE=y

arch/arm/configs/pxa_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -411,7 +411,6 @@ CONFIG_MFD_MAX77693=y 
CONFIG_MFD_MAX8907=m

CONFIG_EZX_PCAP=y

CONFIG_UCB1400_CORE=m

CONFIG_MFD_PM8921_CORE=m

CONFIG_MFD_SEC_CORE=y

CONFIG_MFD_PALMAS=y

CONFIG_MFD_TPS65090=y

arch/arm/configs/qcom_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ CONFIG_POWER_RESET=y 
CONFIG_POWER_RESET_MSM=y

CONFIG_THERMAL=y

CONFIG_MFD_PM8XXX=y

CONFIG_MFD_PM8921_CORE=y

CONFIG_MFD_QCOM_RPM=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

drivers/leds/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ config LEDS_VERSATILE 


config LEDS_PM8058

	tristate "LED Support for the Qualcomm PM8058 PMIC"

	depends on MFD_PM8921_CORE

	depends on MFD_PM8XXX

	depends on LEDS_CLASS

	help

	  Choose this option if you want to use the LED drivers in

drivers/mfd/Kconfig

+5 −9
Original line number Diff line number Diff line
@@ -756,24 +756,20 @@ config UCB1400_CORE 
	  module will be called ucb1400_core.



config MFD_PM8XXX

	tristate



config MFD_PM8921_CORE

	tristate "Qualcomm PM8921 PMIC chip"

	tristate "Qualcomm PM8xxx PMIC chips driver"

	depends on (ARM || HEXAGON)

	select IRQ_DOMAIN

	select MFD_CORE

	select MFD_PM8XXX

	select REGMAP

	help

	  If you say yes to this option, support will be included for the

	  built-in PM8921 PMIC chip.

	  built-in PM8xxx PMIC chips.



	  This is required if your board has a PM8921 and uses its features,

	  This is required if your board has a PM8xxx and uses its features,

	  such as: MPPs, GPIOs, regulators, interrupts, and PWM.



	  Say M here if you want to include support for PM8921 chip as a module.

	  This will build a module called "pm8921-core".

	  Say M here if you want to include support for PM8xxx chips as a

	  module. This will build a module called "pm8xxx-core".



config MFD_QCOM_RPM

	tristate "Qualcomm Resource Power Manager (RPM)"