diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-27 17:20:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-27 17:20:48 -0700 |
| commit | 5ded6ea4629a9d9ecf438361d6ffed045ab7d91b (patch) | |
| tree | 678f5496b44e7f7758f2912583e27a4617a3229e | |
| parent | c163b524d2ab37eb102ea0d20f339fad7bb080c9 (diff) | |
| parent | 7602e05df73f3c775d5ef808c0bc4af9711e4438 (diff) | |
Merge tag 'mfd-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD fixes from Lee Jones:
"Couple of simple fixes due for the v3.16 -rcs"
* tag 'mfd-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
mfd: ab8500: Fix dt irq mapping
mfd: davinci: Voicecodec needs regmap_mmio
mfd: STw481x: Allow modular build
mfd: UCB1x00: Enable modular build
| -rw-r--r-- | drivers/mfd/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/mfd/ab8500-core.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index ee8204cc31e..6cc4b6acc22 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -760,6 +760,7 @@ config MFD_SYSCON config MFD_DAVINCI_VOICECODEC tristate select MFD_CORE + select REGMAP_MMIO config MFD_TI_AM335X_TSCADC tristate "TI ADC / Touch Screen chip support" @@ -1225,7 +1226,7 @@ config MFD_WM8994 functionaltiy of the device other drivers must be enabled. config MFD_STW481X - bool "Support for ST Microelectronics STw481x" + tristate "Support for ST Microelectronics STw481x" depends on I2C && ARCH_NOMADIK select REGMAP_I2C select MFD_CORE @@ -1248,7 +1249,7 @@ config MCP_SA11X0 # Chip drivers config MCP_UCB1200 - bool "Support for UCB1200 / UCB1300" + tristate "Support for UCB1200 / UCB1300" depends on MCP_SA11X0 select MCP diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index a8ee4a36a1d..cf2e6a198c6 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -591,7 +591,7 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np) num_irqs = AB8500_NR_IRQS; /* If ->irq_base is zero this will give a linear mapping */ - ab8500->domain = irq_domain_add_simple(NULL, + ab8500->domain = irq_domain_add_simple(ab8500->dev->of_node, num_irqs, 0, &ab8500_irq_ops, ab8500); |