leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Couple of simple fixes due for the v3.16 -rcs.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTrUkLAAoJEFGvii+H/HdhIvYP/jjGSsJcEa3wcD8Mi9gFc1SN
 /lspNCCW4CZgBJN9jzz5uCh68SjtllbxEnjOuL04CsnVZSIp4N1+zdJyM997e4oA
 Ge6cu3fxy62Jghnq+l8YmJf8tZ8VtDdNrLX4+gOIyu2gyQfVEthHOitcd+NcDUuD
 vI/sV+N9jDfe1vqNSJTLV3OQ8IV9S4z8gF054yT1j0r1dLjPs6SV1XAW3UYtlCrK
 f+LtS3vowSnIymFke7XYyITY4Ad/vLXbW5E5iubKO6xNwlpRfFx9Txmpe4S+bIN3
 GV/pZNhhWuIpdYlf70BRpbR/wSVoCUAQ9XhgZOMNMITWYNysqWdRie28pPZpRarF
 VoXOsBVzISebDyTzNBsLj6iXNiozCZeOWIt4gPbM8RBsIjGU/Ux0C+ta18W6y1t/
 iAVQPNd8PeTK2HTTDAUqMz4VIuRxGSYSyE+L08Ui1RvlqlMJkGDp4smNOO3PKQRD
 pahD0eCPURbppiZ8+8fcqUjLBEvD9JYzZgB9Apvp/8wDpWPO0hIFZNENxXUZQzGN
 eTXDwQx+DH5NjHUH2dwaEJN8yxIUH1RKkQ6m9qBSWAy2jKYusNON9DTyvz17THS6
 tjONGfC3L57TTsm1VOrZUQrMfclWGjpoVcHQdZFtdcFH+cTOzNSmzL+w4k5C8sTT
 VAje5qbrnvJeW8MYAsE2
 =stYK
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2014-06-27 17:20:48 -07:00
commit 5ded6ea462
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mfd/Kconfig
View File

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

2
drivers/mfd/ab8500-core.c
View File

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