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

Commit 8e128ce3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.o-hand.com/linux-mfd 

* 'for-next' of git://git.o-hand.com/linux-mfd: (30 commits)
  mfd: Fix section mismatch in da903x
  mfd: move drivers/i2c/chips/menelaus.c to drivers/mfd
  mfd: move drivers/i2c/chips/tps65010.c to drivers/mfd
  mfd: dm355evm msp430 driver
  mfd: Add missing break from wm3850-core
  mfd: Add WM8351 support
  mfd: Support configurable numbers of DCDCs and ISINKs on WM8350
  mfd: Handle missing WM8350 platform data
  mfd: Add WM8352 support
  mfd: Use irq_to_desc in twl4030 code
  power_supply: Add Dialog DA9030 battery charger driver
  mfd: Dialog DA9030 battery charger MFD driver
  mfd: Register WM8400 codec device
  mfd: Pass driver_data onto child devices
  mfd: Fix twl4030-core.c build error
  mfd: twl4030 regulator bug fixes
  mfd: twl4030: create some regulator devices
  mfd: twl4030: cleanup symbols and OMAP dependency
  mfd: twl4030: simplified child creation code
  power_supply: Add battery health reporting for WM8350
  ...
parents 0bbb2753 3f874b66

drivers/i2c/chips/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -126,19 +126,6 @@ config ISP1301_OMAP 
	  This driver can also be built as a module.  If so, the module

	  will be called isp1301_omap.



config TPS65010

	tristate "TPS6501x Power Management chips"

	depends on GPIOLIB

	default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK

	help

	  If you say yes here you get support for the TPS6501x series of

	  Power Management chips.  These include voltage regulators,

	  lithium ion/polymer battery charging, and other features that

	  are often used in portable devices like cell phones and cameras.



	  This driver can also be built as a module.  If so, the module

	  will be called tps65010.



config SENSORS_MAX6875

	tristate "Maxim MAX6875 Power supply supervisor"

	depends on EXPERIMENTAL
@@ -164,16 +151,6 @@ config SENSORS_TSL2550 
	  This driver can also be built as a module.  If so, the module

	  will be called tsl2550.



config MENELAUS

	bool "TWL92330/Menelaus PM chip"

	depends on I2C=y && ARCH_OMAP24XX

	help

	  If you say yes here you get support for the Texas Instruments

	  TWL92330/Menelaus Power Management chip. This include voltage

	  regulators, Dual slot memory card tranceivers, real-time clock

	  and other features that are often used in portable devices like

	  cell phones and PDAs.



config MCU_MPC8349EMITX

	tristate "MPC8349E-mITX MCU driver"

	depends on I2C && PPC_83xx

drivers/i2c/chips/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o 
obj-$(CONFIG_PCF8575)		+= pcf8575.o

obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o

obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o

obj-$(CONFIG_TPS65010)		+= tps65010.o

obj-$(CONFIG_MENELAUS)		+= menelaus.o

obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o

obj-$(CONFIG_MCU_MPC8349EMITX)	+= mcu_mpc8349emitx.o

drivers/mfd/Kconfig

+65 −1
Original line number Diff line number Diff line
@@ -34,6 +34,14 @@ config MFD_ASIC3 
	  This driver supports the ASIC3 multifunction chip found on many

	  PDAs (mainly iPAQ and HTC based ones)



config MFD_DM355EVM_MSP

	bool "DaVinci DM355 EVM microcontroller"

	depends on I2C && MACH_DAVINCI_DM355_EVM

	help

	  This driver supports the MSP430 microcontroller used on these

	  boards.  MSP430 firmware manages resets and power sequencing,

	  inputs from buttons and the IR remote, LEDs, an RTC, and more.



config HTC_EGPIO

	bool "HTC EGPIO support"

	depends on GENERIC_HARDIRQS && GPIOLIB && ARM
@@ -61,9 +69,32 @@ config UCB1400_CORE 
	  To compile this driver as a module, choose M here: the

	  module will be called ucb1400_core.



config TPS65010

	tristate "TPS6501x Power Management chips"

	depends on I2C && GPIOLIB

	default y if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_OSK

	help

	  If you say yes here you get support for the TPS6501x series of

	  Power Management chips.  These include voltage regulators,

	  lithium ion/polymer battery charging, and other features that

	  are often used in portable devices like cell phones and cameras.



	  This driver can also be built as a module.  If so, the module

	  will be called tps65010.



config MENELAUS

	bool "Texas Instruments TWL92330/Menelaus PM chip"

	depends on I2C=y && ARCH_OMAP24XX

	help

	  If you say yes here you get support for the Texas Instruments

	  TWL92330/Menelaus Power Management chip. This include voltage

	  regulators, Dual slot memory card tranceivers, real-time clock

	  and other features that are often used in portable devices like

	  cell phones and PDAs.



config TWL4030_CORE

	bool "Texas Instruments TWL4030/TPS659x0 Support"

	depends on I2C=y && GENERIC_HARDIRQS && (ARCH_OMAP2 || ARCH_OMAP3)

	depends on I2C=y && GENERIC_HARDIRQS

	help

	  Say yes here if you have TWL4030 family chip on your board.

	  This core driver provides register access and IRQ handling
@@ -116,6 +147,7 @@ config PMIC_DA903X 


config MFD_WM8400

	tristate "Support Wolfson Microelectronics WM8400"

	select MFD_CORE

	depends on I2C

	help

	  Support for the Wolfson Microelecronics WM8400 PMIC and audio
@@ -142,6 +174,38 @@ config MFD_WM8350_CONFIG_MODE_3 
	bool

	depends on MFD_WM8350



config MFD_WM8351_CONFIG_MODE_0

	bool

	depends on MFD_WM8350



config MFD_WM8351_CONFIG_MODE_1

	bool

	depends on MFD_WM8350



config MFD_WM8351_CONFIG_MODE_2

	bool

	depends on MFD_WM8350



config MFD_WM8351_CONFIG_MODE_3

	bool

	depends on MFD_WM8350



config MFD_WM8352_CONFIG_MODE_0

	bool

	depends on MFD_WM8350



config MFD_WM8352_CONFIG_MODE_1

	bool

	depends on MFD_WM8350



config MFD_WM8352_CONFIG_MODE_2

	bool

	depends on MFD_WM8350



config MFD_WM8352_CONFIG_MODE_3

	bool

	depends on MFD_WM8350



config MFD_WM8350_I2C

	tristate "Support Wolfson Microelectronics WM8350 with I2C"

	select MFD_WM8350

drivers/mfd/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ obj-$(CONFIG_MFD_ASIC3) += asic3.o 
obj-$(CONFIG_HTC_EGPIO)		+= htc-egpio.o

obj-$(CONFIG_HTC_PASIC3)	+= htc-pasic3.o



obj-$(CONFIG_MFD_DM355EVM_MSP)	+= dm355evm_msp.o



obj-$(CONFIG_MFD_T7L66XB)	+= t7l66xb.o

obj-$(CONFIG_MFD_TC6387XB)	+= tc6387xb.o

obj-$(CONFIG_MFD_TC6393XB)	+= tc6393xb.o
@@ -17,6 +19,9 @@ wm8350-objs := wm8350-core.o wm8350-regmap.o wm8350-gpio.o 
obj-$(CONFIG_MFD_WM8350)	+= wm8350.o

obj-$(CONFIG_MFD_WM8350_I2C)	+= wm8350-i2c.o



obj-$(CONFIG_TPS65010)		+= tps65010.o

obj-$(CONFIG_MENELAUS)		+= menelaus.o



obj-$(CONFIG_TWL4030_CORE)	+= twl4030-core.o twl4030-irq.o



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

drivers/mfd/da903x.c

+14 −2
Original line number Diff line number Diff line
@@ -151,12 +151,24 @@ int da903x_write(struct device *dev, int reg, uint8_t val) 
}

EXPORT_SYMBOL_GPL(da903x_write);



int da903x_writes(struct device *dev, int reg, int len, uint8_t *val)

{

	return __da903x_writes(to_i2c_client(dev), reg, len, val);

}

EXPORT_SYMBOL_GPL(da903x_writes);



int da903x_read(struct device *dev, int reg, uint8_t *val)

{

	return __da903x_read(to_i2c_client(dev), reg, val);

}

EXPORT_SYMBOL_GPL(da903x_read);



int da903x_reads(struct device *dev, int reg, int len, uint8_t *val)

{

	return __da903x_reads(to_i2c_client(dev), reg, len, val);

}

EXPORT_SYMBOL_GPL(da903x_reads);



int da903x_set_bits(struct device *dev, int reg, uint8_t bit_mask)

{

	struct da903x_chip *chip = dev_get_drvdata(dev);
@@ -435,13 +447,13 @@ static const struct i2c_device_id da903x_id_table[] = { 
};

MODULE_DEVICE_TABLE(i2c, da903x_id_table);



static int __devexit __remove_subdev(struct device *dev, void *unused)

static int __remove_subdev(struct device *dev, void *unused)

{

	platform_device_unregister(to_platform_device(dev));

	return 0;

}



static int __devexit da903x_remove_subdevs(struct da903x_chip *chip)

static int da903x_remove_subdevs(struct da903x_chip *chip)

{

	return device_for_each_child(chip->dev, NULL, __remove_subdev);

}