Commit 2dfea380 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 

Pull MFS update from Samuel Ortiz:
 "This is the MFD patch set for the 3.8 merge window.

  We have several new drivers, most of the time coming with their sub
  devices drivers:

   - Austria Microsystem's AS3711
   - Nano River's viperboard
   - TI's TPS80031, AM335x TS/ADC,
   - Realtek's MMC/memstick card reader
   - Nokia's retu

  We also got some notable cleanups and improvements:

   - tps6586x got converted to IRQ domains.
   - tps65910 and tps65090 moved to the regmap IRQ API.
   - STMPE is now Device Tree aware.
   - A general twl6040 and twl-core cleanup, with moves to the regmap
     I/O and IRQ APIs and a conversion to the recently added PWM
     framework.
   - sta2x11 gained regmap support.

  Then the rest is mostly tiny cleanups and fixes, among which we have
  Mark's wm5xxx and wm8xxx patchset."

Far amount of annoying but largely trivial conflicts.  Many due to
__devinit/exit removal, others due to one or two of the new drivers also
having come in through another tree.

* tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits)
  mfd: tps6507x: Convert to devm_kzalloc
  mfd: stmpe: Update DT support for stmpe driver
  mfd: wm5102: Add readback of DSP status 3 register
  mfd: arizona: Log if we fail to create the primary IRQ domain
  mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ
  mfd: tps80031: Add terminating entry for tps80031_id_table
  mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask()
  mfd: wm5102: Add tuning for revision B
  mfd: arizona: Defer patch initialistation until after first device boot
  mfd: tps65910: Fix wrong ack_base register
  mfd: tps65910: Remove unused data
  mfd: stmpe: Get rid of irq_invert_polarity
  mfd: ab8500-core: Fix invalid free of devm_ allocated data
  mfd: wm5102: Mark DSP memory regions as volatile
  mfd: wm5102: Correct default for LDO1_CONTROL_2
  mfd: arizona: Register haptics devices
  mfd: wm8994: Make current device behaviour the default
  mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ
  mfd: Fix stmpe.c build when OF is not enabled
  mfd: jz4740-adc: Use devm_kzalloc
  ...
parents aed606e3 1881b68b

Documentation/devicetree/bindings/mfd/stmpe.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* ST Microelectronics STMPE Multi-Functional Device



STMPE is an MFD device which may expose the following inbuilt devices: gpio,

keypad, touchscreen, adc, pwm, rotator.



Required properties:

 - compatible                   : "st,stmpe[610|801|811|1601|2401|2403]"

 - reg                          : I2C/SPI address of the device



Optional properties:

 - interrupts                   : The interrupt outputs from the controller

 - interrupt-controller         : Marks the device node as an interrupt controller

 - interrupt-parent             : Specifies which IRQ controller we're connected to

 - wakeup-source                : Marks the input device as wakable

 - st,autosleep-timeout         : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024



Example:



	stmpe1601: stmpe1601@40 {

		compatible = "st,stmpe1601";

		reg = <0x40>;

		interrupts = <26 0x4>;

		interrupt-parent = <&gpio6>;

		interrupt-controller;



		wakeup-source;

		st,autosleep-timeout = <1024>;

	};

Documentation/devicetree/bindings/regulator/tps65217.txt

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ Required properties: 
  using the standard binding for regulators found at

  Documentation/devicetree/bindings/regulator/regulator.txt.



Optional properties:

- ti,pmic-shutdown-controller: Telling the PMIC to shutdown on PWR_EN toggle.



  The valid names for regulators are:

  tps65217: dcdc1, dcdc2, dcdc3, ldo1, ldo2, ldo3 and ldo4
@@ -20,6 +23,7 @@ Example: 


	tps: tps@24 {

		compatible = "ti,tps65217";

		ti,pmic-shutdown-controller;



		regulators {

			dcdc1_reg: dcdc1 {

drivers/gpio/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -683,4 +683,17 @@ config GPIO_MSIC 
	  Enable support for GPIO on intel MSIC controllers found in

	  intel MID devices



comment "USB GPIO expanders:"



config GPIO_VIPERBOARD

	tristate "Viperboard GPIO a & b support"

	depends on MFD_VIPERBOARD && USB

	help

	  Say yes here to access the GPIO signals of Nano River

	  Technologies Viperboard. There are two GPIO chips on the

	  board: gpioa and gpiob.

          See viperboard API specification and Nano

          River Tech's viperboard.h for detailed meaning

          of the module parameters.



endif

drivers/gpio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ obj-$(CONFIG_GPIO_TS5500) += gpio-ts5500.o 
obj-$(CONFIG_GPIO_TWL4030)	+= gpio-twl4030.o

obj-$(CONFIG_GPIO_TWL6040)	+= gpio-twl6040.o

obj-$(CONFIG_GPIO_UCB1400)	+= gpio-ucb1400.o

obj-$(CONFIG_GPIO_VIPERBOARD)	+= gpio-viperboard.o

obj-$(CONFIG_GPIO_VR41XX)	+= gpio-vr41xx.o

obj-$(CONFIG_GPIO_VT8500)	+= gpio-vt8500.o

obj-$(CONFIG_GPIO_VX855)	+= gpio-vx855.o

drivers/gpio/gpio-da9052.c

+5 −1
Original line number Diff line number Diff line
@@ -185,7 +185,11 @@ static int da9052_gpio_to_irq(struct gpio_chip *gc, u32 offset) 
	struct da9052_gpio *gpio = to_da9052_gpio(gc);

	struct da9052 *da9052 = gpio->da9052;



	return da9052->irq_base + DA9052_IRQ_GPI0 + offset;

	int irq;



	irq = regmap_irq_get_virq(da9052->irq_data, DA9052_IRQ_GPI0 + offset);



	return irq;

}



static struct gpio_chip reference_gp = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE