tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 5ded6ea4 c163b524

+4 -3
+3 -2
drivers/mfd/Kconfig
··· 760 760 config MFD_DAVINCI_VOICECODEC 761 761 tristate 762 762 select MFD_CORE 763 + select REGMAP_MMIO 763 764 764 765 config MFD_TI_AM335X_TSCADC 765 766 tristate "TI ADC / Touch Screen chip support" ··· 1226 1225 functionaltiy of the device other drivers must be enabled. 1227 1226 1228 1227 config MFD_STW481X 1229 - bool "Support for ST Microelectronics STw481x" 1228 + tristate "Support for ST Microelectronics STw481x" 1230 1229 depends on I2C && ARCH_NOMADIK 1231 1230 select REGMAP_I2C 1232 1231 select MFD_CORE ··· 1249 1248 1250 1249 # Chip drivers 1251 1250 config MCP_UCB1200 1252 - bool "Support for UCB1200 / UCB1300" 1251 + tristate "Support for UCB1200 / UCB1300" 1253 1252 depends on MCP_SA11X0 1254 1253 select MCP 1255 1254
+1 -1
drivers/mfd/ab8500-core.c
··· 591 591 num_irqs = AB8500_NR_IRQS; 592 592 593 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 595 num_irqs, 0, 596 596 &ab8500_irq_ops, ab8500); 597 597