Commit a6a1d648 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: (90 commits)
  mfd: Push byte swaps out of wm8994 bulk read path
  mfd: Rename ab8500 gpadc header
  mfd: Constify WM8994 write path
  mfd: Push byte swap out of WM8994 bulk I/O
  mfd: Avoid copying data in WM8994 I2C write
  mfd: Remove copy from WM831x I2C write function
  mfd: Staticise WM8994 PM ops
  regulator: Add a subdriver for TI TPS6105x regulator portions v2
  mfd: Add a core driver for TI TPS61050/TPS61052 chips v2
  gpio: Add Tunnel Creek support to sch_gpio
  mfd: Add Tunnel Creek support to lpc_sch
  pci_ids: Add Intel Tunnel Creek LPC Bridge device ID.
  regulator: MAX8997/8966 support
  mfd: Add WM8994 bulk register write operation
  mfd: Append additional read write on 88pm860x
  mfd: Adopt mfd_data in 88pm860x input driver
  mfd: Adopt mfd_data in 88pm860x regulator
  mfd: Adopt mfd_data in 88pm860x led
  mfd: Adopt mfd_data in 88pm860x backlight
  mfd: Fix MAX8997 Kconfig entry typos
  ...
parents 1b506cfb 316b6cc0

Documentation/hwmon/twl4030-madc-hwmon

0 → 100644
+45 −0
Original line number Diff line number Diff line 
Kernel driver twl4030-madc

=========================



Supported chips:

	* Texas Instruments TWL4030

	Prefix: 'twl4030-madc'





Authors:

	J Keerthy <j-keerthy@ti.com>



Description

-----------



The Texas Instruments TWL4030 is a Power Management and Audio Circuit. Among

other things it contains a 10-bit A/D converter MADC. The converter has 16

channels which can be used in different modes.





See this table for the meaning of the different channels



Channel Signal

------------------------------------------

0	Battery type(BTYPE)

1	BCI: Battery temperature (BTEMP)

2	GP analog input

3	GP analog input

4	GP analog input

5	GP analog input

6	GP analog input

7	GP analog input

8	BCI: VBUS voltage(VBUS)

9	Backup Battery voltage (VBKP)

10	BCI: Battery charger current (ICHG)

11	BCI: Battery charger voltage (VCHG)

12	BCI: Main battery voltage (VBAT)

13	Reserved

14	Reserved

15	VRUSB Supply/Speaker left/Speaker right polarization level





The Sysfs nodes will represent the voltage in the units of mV,

the temperature channel shows the converted temperature in

degree celcius. The Battery charging current channel represents

battery charging current in mA.

arch/arm/mach-imx/mach-mx27_3ds.c

+7 −4
Original line number Diff line number Diff line
@@ -232,10 +232,13 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = { 
};



/* MC13783 */

static struct mc13xxx_platform_data mc13783_pdata __initdata = {

static struct mc13xxx_platform_data mc13783_pdata = {

	.regulators = {

		.regulators = mx27_3ds_regulators,

		.num_regulators = ARRAY_SIZE(mx27_3ds_regulators),

	.flags  = MC13XXX_USE_REGULATOR,



	},

	.flags  = MC13783_USE_REGULATOR,

};



/* SPI */

arch/arm/mach-imx/mach-pcm038.c

+6 −4
Original line number Diff line number Diff line
@@ -263,10 +263,12 @@ static struct mc13xxx_regulator_init_data pcm038_regulators[] = { 
};



static struct mc13xxx_platform_data pcm038_pmic = {

	.regulators = {

		.regulators = pcm038_regulators,

		.num_regulators = ARRAY_SIZE(pcm038_regulators),

	.flags = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR |

		 MC13XXX_USE_TOUCHSCREEN,

	},

	.flags = MC13783_USE_ADC | MC13783_USE_REGULATOR |

		 MC13783_USE_TOUCHSCREEN,

};



static struct spi_board_info pcm038_spi_board_info[] __initdata = {

arch/arm/mach-mx3/mach-mx31_3ds.c

+6 −4
Original line number Diff line number Diff line
@@ -488,10 +488,12 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { 
};



/* MC13783 */

static struct mc13xxx_platform_data mc13783_pdata __initdata = {

static struct mc13xxx_platform_data mc13783_pdata = {

	.regulators = {

		.regulators = mx31_3ds_regulators,

		.num_regulators = ARRAY_SIZE(mx31_3ds_regulators),

	.flags  = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN

	},

	.flags  = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN,

};



/* SPI */

arch/arm/mach-mx3/mach-mx31moboard.c

+4 −2
Original line number Diff line number Diff line
@@ -268,8 +268,10 @@ static struct mc13783_leds_platform_data moboard_leds = { 
};



static struct mc13xxx_platform_data moboard_pmic = {

	.regulators = {

		.regulators = moboard_regulators,

		.num_regulators = ARRAY_SIZE(moboard_regulators),

	},

	.leds = &moboard_leds,

	.flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_RTC |

		MC13XXX_USE_ADC | MC13XXX_USE_LED,

CRA Git | Maintained and supported by SUSTech CRA and CCSE