p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Immutable branch between MFD, ARM and LED due for the v4.10 merge window 

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYMu7NAAoJEFGvii+H/HdhUgcP/i7Ii38BIAr4W3VpERGrukmm
 8+KgMDi8gtsIudgsAZTYYqPWk4XAGKXMm0rOgG7p4ivUAEKaRvfSQ6Of510IMoq8
 M8HofvyWZurdCHptsRGU13qp8pyfkz1WW+iYzNP7KKGqA4dcOVfCxNwc3zYZ4Mi+
 7YTC1UPb0hKinhwWULOxKwdncspH54EgHxgiDJeVaowQh6p1fKYzxf7cTcypwPdR
 ZhcP5zuvgaV765h/v4jBcsu6e6pCWBHoCSRrS3IxDm0OMbe/fig9AB1QoJ/M0SE9
 oDK6ejrbdN7+HWPWR0Zx3i7dJFPxqqvg8/cwwAynDz3O/rKi1sJ/uFd95mWLWmXu
 FuWxgwtCRMd8s0OoHuMvI0NEA9n6CUvaFhg4TpI6MDLW1s+8nW7WpTRGiXlTBOol
 UjiODJtnHzHRkiWFy8O+7s2Kqa7/IR36ExqSscl812oYBNeR2nLLDSAVlbHvXVil
 TLa1Y6noGoBvHK/zmaxFux7bQcmNwBOimCNNkGI4KdGYcDnBCJHpXYRqit4tUt+H
 dKI0BLvOWP4Jq2jvMCb9zjfhRLzezc2lMHr0dxOymTuAqSaRta7qt3nSFQb1KTxw
 6rXZm6YYNIRX/8h7gEGSEmGjubYKmMLzehGRT/njhbJvl1rNE5brdjH6l6eDzT3v
 UngwPP3SL/eAWBqX8NqO
 =BIXN
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Jacek Anaszewski 2016-11-22 13:52:06 +01:00
parent eb1610b4c2 40a3a0f2ba
commit 2a4f8114f2
7 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/multi_v7_defconfig
View File

@ -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

1
arch/arm/configs/pxa_defconfig
View File

@ -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

1
arch/arm/configs/qcom_defconfig
View File

@ -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

2
drivers/leds/Kconfig
View File

@ -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

14
drivers/mfd/Kconfig
View File

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

2
drivers/mfd/Makefile
View File

@ -172,7 +172,7 @@ obj-$(CONFIG_MFD_SI476X_CORE) += si476x-core.o
obj-$(CONFIG_MFD_CS5535) += cs5535-mfd.o
obj-$(CONFIG_MFD_OMAP_USB_HOST) += omap-usb-host.o omap-usb-tll.o
obj-$(CONFIG_MFD_PM8921_CORE) += pm8921-core.o ssbi.o
obj-$(CONFIG_MFD_PM8XXX) += qcom-pm8xxx.o ssbi.o
obj-$(CONFIG_MFD_QCOM_RPM) += qcom_rpm.o
obj-$(CONFIG_MFD_SPMI_PMIC) += qcom-spmi-pmic.o
obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o

42
drivers/mfd/pm8921-core.c → drivers/mfd/qcom-pm8xxx.c
View File

@ -53,7 +53,7 @@
#define REG_HWREV 0x002 /* PMIC4 revision */
#define REG_HWREV_2 0x0E8 /* PMIC4 revision 2 */
#define PM8921_NR_IRQS 256
#define PM8XXX_NR_IRQS 256
struct pm_irq_chip {
struct regmap *regmap;
@ -308,22 +308,22 @@ static const struct regmap_config ssbi_regmap_config = {
.reg_write = ssbi_reg_write
};
static const struct of_device_id pm8921_id_table[] = {
static const struct of_device_id pm8xxx_id_table[] = {
{ .compatible = "qcom,pm8018", },
{ .compatible = "qcom,pm8058", },
{ .compatible = "qcom,pm8921", },
{ }
};
MODULE_DEVICE_TABLE(of, pm8921_id_table);
MODULE_DEVICE_TABLE(of, pm8xxx_id_table);
static int pm8921_probe(struct platform_device *pdev)
static int pm8xxx_probe(struct platform_device *pdev)
{
struct regmap *regmap;
int irq, rc;
unsigned int val;
u32 rev;
struct pm_irq_chip *chip;
unsigned int nirqs = PM8921_NR_IRQS;
unsigned int nirqs = PM8XXX_NR_IRQS;
irq = platform_get_irq(pdev, 0);
if (irq < 0)
@ -384,46 +384,46 @@ static int pm8921_probe(struct platform_device *pdev)
return rc;
}
static int pm8921_remove_child(struct device *dev, void *unused)
static int pm8xxx_remove_child(struct device *dev, void *unused)
{
platform_device_unregister(to_platform_device(dev));
return 0;
}
static int pm8921_remove(struct platform_device *pdev)
static int pm8xxx_remove(struct platform_device *pdev)
{
int irq = platform_get_irq(pdev, 0);
struct pm_irq_chip *chip = platform_get_drvdata(pdev);
device_for_each_child(&pdev->dev, NULL, pm8921_remove_child);
device_for_each_child(&pdev->dev, NULL, pm8xxx_remove_child);
irq_set_chained_handler_and_data(irq, NULL, NULL);
irq_domain_remove(chip->irqdomain);
return 0;
}
static struct platform_driver pm8921_driver = {
.probe = pm8921_probe,
.remove = pm8921_remove,
static struct platform_driver pm8xxx_driver = {
.probe = pm8xxx_probe,
.remove = pm8xxx_remove,
.driver = {
.name = "pm8921-core",
.of_match_table = pm8921_id_table,
.name = "pm8xxx-core",
.of_match_table = pm8xxx_id_table,
},
};
static int __init pm8921_init(void)
static int __init pm8xxx_init(void)
{
return platform_driver_register(&pm8921_driver);
return platform_driver_register(&pm8xxx_driver);
}
subsys_initcall(pm8921_init);
subsys_initcall(pm8xxx_init);
static void __exit pm8921_exit(void)
static void __exit pm8xxx_exit(void)
{
platform_driver_unregister(&pm8921_driver);
platform_driver_unregister(&pm8xxx_driver);
}
module_exit(pm8921_exit);
module_exit(pm8xxx_exit);
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("PMIC 8921 core driver");
MODULE_DESCRIPTION("PMIC 8xxx core driver");
MODULE_VERSION("1.0");
MODULE_ALIAS("platform:pm8921-core");
MODULE_ALIAS("platform:pm8xxx-core");