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
Unified · Split
| @@ -760,6 +760,7 @@ config MFD_SYSCON · 759 unmodified lines | |||
| 760 | config MFD_DAVINCI_VOICECODEC | 760 | config MFD_DAVINCI_VOICECODEC |
| 761 | tristate | 761 | tristate |
| 762 | select MFD_CORE | 762 | select MFD_CORE |
| 763 | select REGMAP_MMIO | ||
| 763 | 764 | ||
| 764 | config MFD_TI_AM335X_TSCADC | 765 | config MFD_TI_AM335X_TSCADC |
| 765 | tristate "TI ADC / Touch Screen chip support" | 766 | tristate "TI ADC / Touch Screen chip support" |
| @@ -1225,7 +1226,7 @@ config MFD_WM8994 · 459 unmodified lines | |||
| 1225 | functionaltiy of the device other drivers must be enabled. | 1226 | functionaltiy of the device other drivers must be enabled. |
| 1226 | 1227 | ||
| 1227 | config MFD_STW481X | 1228 | config MFD_STW481X |
| 1228 | bool "Support for ST Microelectronics STw481x" | 1229 | tristate "Support for ST Microelectronics STw481x" |
| 1229 | depends on I2C && ARCH_NOMADIK | 1230 | depends on I2C && ARCH_NOMADIK |
| 1230 | select REGMAP_I2C | 1231 | select REGMAP_I2C |
| 1231 | select MFD_CORE | 1232 | select MFD_CORE |
| @@ -1248,7 +1249,7 @@ config MCP_SA11X0 · 16 unmodified lines | |||
| 1248 | 1249 | ||
| 1249 | # Chip drivers | 1250 | # Chip drivers |
| 1250 | config MCP_UCB1200 | 1251 | config MCP_UCB1200 |
| 1251 | bool "Support for UCB1200 / UCB1300" | 1252 | tristate "Support for UCB1200 / UCB1300" |
| 1252 | depends on MCP_SA11X0 | 1253 | depends on MCP_SA11X0 |
| 1253 | select MCP | 1254 | select MCP |
| 1254 | 1255 | ||
| @@ -591,7 +591,7 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np) · 590 unmodified lines | |||
| 591 | num_irqs = AB8500_NR_IRQS; | 591 | num_irqs = AB8500_NR_IRQS; |
| 592 | 592 | ||
| 593 | /* If ->irq_base is zero this will give a linear mapping */ | 593 | /* If ->irq_base is zero this will give a linear mapping */ |
| 594 | ab8500->domain = irq_domain_add_simple(NULL, | 594 | ab8500->domain = irq_domain_add_simple(ab8500->dev->of_node, |
| 595 | num_irqs, 0, | 595 | num_irqs, 0, |
| 596 | &ab8500_irq_ops, ab8500); | 596 | &ab8500_irq_ops, ab8500); |
| 597 | 597 | ||