Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 114293
b: refs/heads/master
c: da09155
h: refs/heads/master
i:
  114291: 0a5c17d
v: v3
  • Loading branch information
Mark Brown authored and Liam Girdwood committed Oct 13, 2008
1 parent 8d6a0b7 commit ab4d05a
Show file tree
Hide file tree
Showing 7 changed files with 1,495 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ebccec0fa4e35dff0c18663a492a65f4dc6cad7a
refs/heads/master: da09155ac8d3f04c299b3d82a6ab0df8d03da632
6 changes: 6 additions & 0 deletions trunk/drivers/mfd/wm8350-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,12 @@ EXPORT_SYMBOL_GPL(wm8350_device_init);

void wm8350_device_exit(struct wm8350 *wm8350)
{
int i;

for (i = 0; i < ARRAY_SIZE(wm8350->pmic.pdev); i++)
if (wm8350->pmic.pdev[i] != NULL)
platform_device_unregister(wm8350->pmic.pdev[i]);

free_irq(wm8350->chip_irq, wm8350);
flush_work(&wm8350->irq_work);
kfree(wm8350->reg_cache);
Expand Down
9 changes: 9 additions & 0 deletions trunk/drivers/regulator/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,20 @@ config REGULATOR_BQ24022
charging select between 100 mA and 500 mA charging current
limit.

config REGULATOR_WM8350
tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC"
depends on MFD_WM8350
select REGULATOR
help
This driver provides support for the voltage and current regulators
of the WM8350 AudioPlus PMIC.

config REGULATOR_WM8400
tristate "Wolfson Microelectroncis WM8400 AudioPlus PMIC"
depends on MFD_WM8400
select REGULATOR
help
This driver provides support for the voltage regulators of the
WM8400 AudioPlus PMIC.

endmenu
1 change: 1 addition & 0 deletions trunk/drivers/regulator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o

obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o

ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
Loading

0 comments on commit ab4d05a

Please sign in to comment.