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

Commit 40a3a0f2 authored by Linus Walleij's avatar Linus Walleij Committed by Lee Jones
Browse files

mfd: qcom-pm8xxx: Clean up PM8XXX namespace 



The Kconfig and file naming for the PM8xxx driver is totally
confusing:

- Kconfig options MFD_PM8XXX and MFD_PM8921_CORE, some in-kernel
  users depending on or selecting either at random.
- A driver file named pm8921-core.c even if it is indeed
  used by the whole PM8xxx family of chips.
- An irqchip named pm8xxx since it was (I guess) realized that
  the driver was generic for all pm8xxx PMICs.

As I may want to add support for PM8901 this is starting to get
really messy. Fix this situation by:

- Remove the MFD_PM8921_CORE symbol and rely solely on MFD_PM8XXX
  and convert all users, including LEDs Kconfig and ARM defconfigs
  for qcom and multi_v7 to use that single symbol.
- Renaming the driver to qcom-pm8xxx.c to fit along the two
  other qcom* prefixed drivers.
- Rename functions withing the driver from 8921 to 8xxx to
  indicate it is generic.
- Just drop the =m config from the pxa_defconfig, I have no clue
  why it is even there, it is not a Qualcomm platform. (Possibly
  older Kconfig noise from saveconfig.)

Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarAndy Gross <andy.gross@linaro.org>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 1001354c

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)"