Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ded6ea4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c163b524 7602e05d

drivers/mfd/Kconfig

+3 −2
Original line number Original line Diff line number Diff line
@@ -760,6 +760,7 @@ config MFD_SYSCON 
config MFD_DAVINCI_VOICECODEC

config MFD_DAVINCI_VOICECODEC

	tristate

	tristate

	select MFD_CORE

	select MFD_CORE

	select REGMAP_MMIO





config MFD_TI_AM335X_TSCADC

config MFD_TI_AM335X_TSCADC

	tristate "TI ADC / Touch Screen chip support"

	tristate "TI ADC / Touch Screen chip support"
@@ -1225,7 +1226,7 @@ config MFD_WM8994 
	  functionaltiy of the device other drivers must be enabled.

	  functionaltiy of the device other drivers must be enabled.





config MFD_STW481X

config MFD_STW481X

	bool "Support for ST Microelectronics STw481x"

	tristate "Support for ST Microelectronics STw481x"

	depends on I2C && ARCH_NOMADIK

	depends on I2C && ARCH_NOMADIK

	select REGMAP_I2C

	select REGMAP_I2C

	select MFD_CORE

	select MFD_CORE
@@ -1248,7 +1249,7 @@ config MCP_SA11X0 




# Chip drivers

# Chip drivers

config MCP_UCB1200

config MCP_UCB1200

	bool "Support for UCB1200 / UCB1300"

	tristate "Support for UCB1200 / UCB1300"

	depends on MCP_SA11X0

	depends on MCP_SA11X0

	select MCP

	select MCP

drivers/mfd/ab8500-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -591,7 +591,7 @@ static int ab8500_irq_init(struct ab8500 *ab8500, struct device_node *np) 
		num_irqs = AB8500_NR_IRQS;

		num_irqs = AB8500_NR_IRQS;





	/* If ->irq_base is zero this will give a linear mapping */

	/* 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,

			num_irqs, 0,

			&ab8500_irq_ops, ab8500);

			&ab8500_irq_ops, ab8500);