2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
linux-next/include/linux/mfd
Linus Torvalds 2dfea3803d 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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQznPnAAoJEIqAPN1PVmxKuA8P/0nOJduXFM1c0Gy+DD5DnJnG
 cXzzeSTV8iO3a3sHIye43QPJ5V2YUR5uxLTUEOo/G7my/MoZ/azeNidkUD3qLVlm
 wVIq35lcS8dWTZaY7nlpBcWc6e39UB0sEueuJNxyhOv5lnMKdi2tAow5f4vIRQnd
 Q67/EbrgqdltcOpGmVuCdQcvphvWgy+K65jzbJG5zXs7hGX13Q+M5RnYhx76kc8f
 TDd0APZ71n5/RyISFSBSu2vfl2kES6o47aMgqqXMEHri6d3puAaXM0rFoMzXg/4G
 eBdxndN25H7rW7xvt9tuUod2rn1AO7tif5d7jal3Cfj61y3iqKY30yb3OzS9XQXH
 9WZ2qDst11zvzQivxIkMGvfRXRfncNLWR4DrBSqVfSbYV2uQj2eS8C6ONwKVMXsQ
 5tjNp91PFqN19sWQjIjSMcrNswxgpvdQ9mqFTyOGmISbqrpPSTi+MuO8r9+xTfUF
 PnzUX2nVOW/i9NcI7uotjzh8jiw6t8XMVHhkehiSYR9hzCb6MaPsFPN4jWq9XA2m
 1htCHylNpHqHQ3Mup7Is6j0Li1ahdwfm4lbrgiVEA4t4Mqs5E/Ka+3V8laNAKylW
 PfCP/VmnJYzmgVTK/qobFNeKzRqR0i4WTL6T7oAxGL87Q4TJaqKpEkXWne8UXV+Q
 yIbN0fmWfCveCetM+vaf
 =F790
 -----END PGP SIGNATURE-----

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
  ...
2012-12-16 18:55:20 -08:00
..
abx500 mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
arizona This is the MFD patch set for the 3.8 merge window. 2012-12-16 18:55:20 -08:00
da9052 mfd: da9052: Introduce da9052-irq.c 2012-11-20 12:21:10 +01:00
da9055 This is the MFD patch set for the 3.8 merge window. 2012-12-16 18:55:20 -08:00
pcf50633
pm8xxx mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
samsung mfd: Add s2mps11 irq driver 2012-07-16 14:31:59 +02:00
syscon ARM: imx6q: Add iomuxc gpr support into syscon 2012-09-17 15:24:31 +02:00
wm831x MFD changes for 3.5 2012-05-29 11:53:11 -07:00
wm8350 mfd: Remove custom wm8350 cache implementation 2012-07-09 00:16:10 +02:00
wm8994 mfd: wm8994: Store platform data in device 2012-11-23 21:10:13 +09:00
88pm80x.h mfd: remove use of __devinit 2012-11-28 12:20:19 -08:00
88pm860x.h 1. New drivers: 2012-10-07 17:29:24 +09:00
aat2870.h
ab3100.h mfd: ab3100: Split ab3100 headers out of abx500.h 2012-09-14 09:52:15 +02:00
abx500.h ab8500: Add devicetree support for chargalg 2012-11-18 19:37:18 -08:00
adp5520.h
as3711.h mfd: Add an AS3711 PMIC MFD driver 2012-11-23 12:09:19 +01:00
asic3.h MFD changes for 3.5 2012-05-29 11:53:11 -07:00
core.h mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
da903x.h
davinci_voicecodec.h
db8500-prcmu.h mfd: dbx500: Export prmcu_request_ape_opp_100_voltage 2012-10-29 11:05:12 -07:00
dbx500-prcmu.h mfd: dbx500: Export prmcu_request_ape_opp_100_voltage 2012-10-29 11:05:12 -07:00
ds1wm.h
ezx-pcap.h ARM: pxa: remove irq_to_gpio from ezx-pcap driver 2012-08-09 15:16:41 +02:00
htc-egpio.h
htc-pasic3.h
intel_msic.h
janz.h
lm3533.h mfd: Add r_select to lm3533 platform data 2012-05-22 23:47:42 +02:00
lp8788-isink.h mfd: Add lp8788 mfd driver 2012-09-23 20:51:34 +02:00
lp8788.h lp8788-charger: Fix ADC channel names 2012-11-17 20:44:44 -08:00
lpc_ich.h gpio: gpio-ich: Share ownership of GPIO groups 2012-09-14 09:52:13 +02:00
max8907.h mfd: max8907: Add power off control 2012-09-19 12:07:56 +02:00
max8925.h mfd: max8925: Remove array in regulator platform data 2012-09-19 12:39:13 +02:00
max8997-private.h regulator: add device tree support for max8997 2012-11-27 20:05:36 +00:00
max8997.h regulator: add device tree support for max8997 2012-11-27 20:05:36 +00:00
max8998-private.h
max8998.h mfd: printk/comment fixes 2012-09-01 10:01:31 -07:00
max77686-private.h mfd: Remove unused max77686 iolock mutex 2012-07-09 00:16:14 +02:00
max77686.h regulator: max77686: initialize of_node param for regulator register 2012-08-28 11:00:25 -07:00
max77693-private.h mfd: Remove unused max77693 iolock mutex 2012-07-09 00:16:07 +02:00
max77693.h extcon: MAX77693: Add platform data for MUIC device to initialize registers 2012-10-23 16:32:16 +09:00
mc13xxx.h
mc13783.h
mc13892.h
mcp.h
menelaus.h ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h 2012-10-15 13:53:41 -07:00
palmas.h mfd: palmas: Change regulator defns to better suite DT 2012-09-23 20:51:29 +02:00
rc5t583.h mfd: rc5t583: Fix array subscript is above array bounds 2012-11-26 12:10:51 +01:00
rdc321x.h
retu.h mfd: Introduce retu-mfd driver 2012-11-21 16:07:57 +01:00
rtsx_common.h drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
rtsx_pci.h drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
smsc.h mfd: smsc: Add support for smsc gpio io/keypad driver 2012-10-01 15:27:48 +02:00
sta2x11-mfd.h mfd: sta2x11-mfd: Add defines for some sta2x11 sctl registers 2012-11-20 12:21:16 +01:00
stmpe.h mfd: stmpe: Get rid of irq_invert_polarity 2012-11-30 11:54:51 +01:00
syscon.h mfd: Add syscon driver based on regmap 2012-09-17 15:24:14 +02:00
t7l66xb.h
tc3589x.h mfd: Provide the tc3589x with its own IRQ domain 2012-09-17 15:03:38 +02:00
tc6387xb.h
tc6393xb.h
ti_am335x_tscadc.h IIO : ADC: tiadc: Add support of TI's ADC driver 2012-11-05 23:50:27 +01:00
ti_ssp.h
tmio.h mmc: tmio: support caps2 flags 2012-07-21 00:02:18 -04:00
tps6105x.h
tps6507x.h
tps6586x.h This is the MFD patch set for the 3.8 merge window. 2012-12-16 18:55:20 -08:00
tps65090.h This is the MFD patch set for the 3.8 merge window. 2012-12-16 18:55:20 -08:00
tps65217.h backlight: Add TPS65217 WLED driver 2012-09-25 10:42:02 +02:00
tps65910.h mfd: tps65910: Remove unused data 2012-11-30 12:20:35 +01:00
tps65912.h
tps80031.h mfd: Add TI TPS80031 mfd core driver 2012-11-21 16:07:47 +01:00
twl4030-audio.h
twl6040.h mfd: twl6040: Convert to use regmap_irq 2012-11-13 19:54:23 +01:00
ucb1x00.h
viperboard.h iio: adc: Add viperboard adc driver 2012-11-20 12:21:13 +01:00
wl1273-core.h
wm8400-audio.h
wm8400-private.h mfd: Remove wm8400 custom cache implementation 2012-05-20 17:27:01 +02:00
wm8400.h