linux/arch/arm/mach-s3c64xx
Linus Torvalds 30304e5a79 MFD changes for 3.4
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcXgCAAoJEIqAPN1PVmxKh2oP/2Ns+dr4oOF8z+uqYG1oisJd
 CxBTC1Bi9gYBtpiMztPiHZWiQtVXoDgLbLkx6ooWH5dpwCdvU6TVBZUJp4wpELtx
 mMk5vJy4/INHgI0nk5wUOr76rNlQfIcK04f+LHBSG1iljUkoVR3FefVKgoyIP+Wv
 oiCeuCyQcYIUmG1pVt1x43OoS+2xgjWQA67AalLLRj1DOA5OkvUL7NGsrZ1iZTUh
 YHQJsK6ER3MgbFFEImtn10NNFwAEG04o6vi42DFW1O0awm6kmVoLjo46wS+UiKoh
 Vx8t5ZGvlYOZ1ZM9N5ETgQnihBt7cOhA3ivZar8h+WiYVTRJs1ZSkpmnlpmM4YY9
 RCZ5DRw3N39R0ezkNVGSr1Xn1vkysIiZI82frrJiPUYLKihsrBzj2Jq3O25iILCf
 Iyv7HBEJxAb3x0zlF6kPhaA8OW4dssaHTLNx5IJSOKwiwVLdm4RPyOHh9QVz++p/
 p0hvSQWK1MUruBbBrjF/FN+FidgK2iU0iDW/GoDwI7OKymSxg7sauLtp0cZpo6nT
 F+Ep6yl/uR5vxih4LSYFJOjoeKuwIo/x92H0qJ3UroaUs9DNJ7UCKchXXiQ1Wtnz
 tAAsWP1YsMxMzlMxqW5J9w4LJynJ8bqrC0L8+HWzIUwikA8wv8/47Pmc/vPW0Y3N
 5L7KMS8/iFCsS8rPmGeP
 =onDl
 -----END PGP SIGNATURE-----

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

Pull MFD changes from Samuel Ortiz:
 - 4 new drivers: Freescale i.MX on-chip Anatop, Ricoh's RC5T583 and
   TI's TPS65090 and TPS65217.
 - New variants support (8420, 8520 ab9540), cleanups and bug fixes for
   the abx500 and db8500 ST-E chipsets.
 - Some minor fixes and update for the wm8994 from Mark.
 - The beginning of a long term TWL cleanup effort coming from the TI
   folks.
 - Various fixes and cleanups for the s5m, TPS659xx, pm860x, and MAX8997
   drivers.

Fix up trivial conflicts due to duplicate patches and header file
cleanups (<linux/device.h> removal etc).

* tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (97 commits)
  gpio/twl: Add DT support to gpio-twl4030 driver
  gpio/twl: Allocate irq_desc dynamically for SPARSE_IRQ support
  mfd: Detach twl6040 from the pmic mfd driver
  mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups
  mfd: Micro-optimization on twl4030 IRQ handler
  mfd: Make twl4030 SIH SPARSE_IRQ capable
  mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files
  mfd: Remove references already defineid in header file from twl-core
  mfd: Remove unneeded header from twl-core
  mfd: Make twl-core not depend on pdata->irq_base/end
  ARM: OMAP2+: board-omap4-*: Do not use anymore TWL6030_IRQ_BASE in board files
  mfd: Return twl6030_mmc_card_detect IRQ for board setup
  Revert "mfd: Add platform data for MAX8997 haptic driver"
  mfd: Add support for TPS65090
  mfd: Add some da9052-i2c section annotations
  mfd: Build rtc5t583 only if I2C config is selected to y.
  mfd: Add anatop mfd driver
  mfd: Fix compilation error in tps65910.h
  mfd: Add 8420 variant to db8500-prcmu
  mfd: Add 8520 PRCMU variant to db8500-prcmu
  ...
2012-03-28 13:56:35 -07:00
..
include/mach Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc 2012-02-22 22:04:41 +00:00
clock.c Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-03-10 09:51:26 -08:00
common.c ARM: S3C64XX: Make s3c64xx_init_uarts() static 2012-01-27 14:41:20 +09:00
common.h ARM: S3C64XX: use static declaration when it is not used in other files 2012-01-21 12:02:31 +09:00
cpuidle.c ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode 2012-02-11 08:02:43 +09:00
dev-audio.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
dma.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
irq-pm.c ARM: S3C64XX: use static declaration when it is not used in other files 2012-01-21 12:02:31 +09:00
Kconfig ARM: board specific updates 2012-03-27 16:27:28 -07:00
mach-anw6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-crag6410-module.c MFD changes for 3.4 2012-03-28 13:56:35 -07:00
mach-crag6410.c ARM: board specific updates 2012-03-27 16:27:28 -07:00
mach-hmt.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-mini6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-ncp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-real6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq5.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq7.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
mach-smartq.h
mach-smdk6400.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6410.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
Makefile ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S3C64XX: Remove unconditional power domain disables 2012-01-12 02:16:21 +09:00
s3c6400.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
s3c6410.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +09:00
setup-i2c0.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-i2c1.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-ide.c ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped 2010-10-25 16:04:33 +09:00
setup-keypad.c ARM: S3C64XX: Fix keypad setup to configure correct number of rows 2011-03-04 15:46:26 +09:00
setup-sdhci-gpio.c ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:37 +09:00
setup-spi.c ARM: S3C64XX: Modified files for SPI consolidation work 2011-12-23 10:50:00 +09:00
setup-usb-phy.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00