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

Commit 55a6fbf8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
  mfd: early init for MFD running regulators
  mfd: fix tmio related warnings
  mfd: asic3: enable SD/SDIO cell
  mfd: asic3: enable DS1WM cell
  mfd: asic3: remove SD/SDIO controller register definitions
  mfd: asic3: use resource_size macro instead of local variable
  mfd: add ASIC3 IRQ numbers
  mfd: asic3: add clock handling for MFD cells
  mfd: asic3: add asic3_set_register common operation
  mfd: Fix Kconfig help text for WM8350
  mfd: add PCAP driver
  mfd: add U300 AB3100 core support
  drivers/mfd: remove obsolete irq_desc_t typedef
  mfd/pcf50633-gpio.c: add MODULE_LICENSE
  mfd: Mark WM8350 mask revision as readable to match silicon
  mfd: Mark clocks_init as non-init in twl4030-core.c
  mfd: Correct readability of WM8350 register 227
parents 3fe0344f 2021de87

drivers/mfd/Kconfig

+23 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config MFD_SM501_GPIO 
config MFD_ASIC3

	bool "Support for Compaq ASIC3"

	depends on GENERIC_HARDIRQS && GPIOLIB && ARM

	select MFD_CORE

	 ---help---

	  This driver supports the ASIC3 multifunction chip found on many

	  PDAs (mainly iPAQ and HTC based ones)
@@ -152,7 +153,7 @@ config MFD_WM8400 
	depends on I2C

	help

	  Support for the Wolfson Microelecronics WM8400 PMIC and audio

	  CODEC.  This driver adds provides common support for accessing

	  CODEC.  This driver provides common support for accessing

	  the device, additional drivers must be enabled in order to use

	  the functionality of the device.
@@ -241,6 +242,27 @@ config PCF50633_GPIO 
	 Say yes here if you want to include support GPIO for pins on

	 the PCF50633 chip.



config AB3100_CORE

	tristate "ST-Ericsson AB3100 Mixed Signal Circuit core functions"

	depends on I2C

	default y if ARCH_U300

	help

	  Select this to enable the AB3100 Mixed Signal IC core

	  functionality. This connects to a AB3100 on the I2C bus

	  and expose a number of symbols needed for dependent devices

	  to read and write registers and subscribe to events from

	  this multi-functional IC. This is needed to use other features

	  of the AB3100 such as battery-backed RTC, charging control,

	  LEDs, vibrator, system power and temperature, power management

	  and ALSA sound.



config EZX_PCAP

	bool "PCAP Support"

	depends on GENERIC_HARDIRQS && SPI_MASTER

	help

	  This enables the PCAP ASIC present on EZX Phones. This is

	  needed for MMC, TouchScreen, Sound, USB, etc..



endmenu



menu "Multimedia Capabilities Port drivers"

drivers/mfd/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ obj-$(CONFIG_TWL4030_CORE) += twl4030-core.o twl4030-irq.o 


obj-$(CONFIG_MFD_CORE)		+= mfd-core.o



obj-$(CONFIG_EZX_PCAP)		+= ezx-pcap.o



obj-$(CONFIG_MCP)		+= mcp-core.o

obj-$(CONFIG_MCP_SA11X0)	+= mcp-sa11x0.o

obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-core.o
@@ -41,3 +43,4 @@ obj-$(CONFIG_PMIC_DA903X) += da903x.o 
obj-$(CONFIG_MFD_PCF50633)	+= pcf50633-core.o

obj-$(CONFIG_PCF50633_ADC)	+= pcf50633-adc.o

obj-$(CONFIG_PCF50633_GPIO)	+= pcf50633-gpio.o

obj-$(CONFIG_AB3100_CORE)	+= ab3100-core.o

drivers/mfd/ab3100-core.c

0 → 100644
+991 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/mfd/asic3.c

+308 −4

File changed.

Preview size limit exceeded, changes collapsed.

drivers/mfd/da903x.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static int __init da903x_init(void) 
{

	return i2c_add_driver(&da903x_driver);

}

module_init(da903x_init);

subsys_initcall(da903x_init);



static void __exit da903x_exit(void)

{