openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/mach-ux500
History
Linus Torvalds 3e701cdfe6 MFD bits for the 3.6 merge window. 
We have support for a few new drivers:
 - Samsung s2mps11
 - Wolfson Microelectronics wm5102 and wm5110
 - Marvell 88PM800 and 88PM805
 - TI twl6041
 
 We also have our regular driver improvements:
 - Device tree and IRQ domain support for STE AB8500
 - Regmap and devm_* API conversion for TI tps6586x
 - Device tree support for Samsung max77686
 - devm_* API conversion for STE AB3100
 
 Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
 tps65090, da9052 and twl-core.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQFpGVAAoJEIqAPN1PVmxKFNoP/1dkYngrxxV6cxdyLJ74APhG
 lVKPgaDxQhdgfwCZJmMeZK1UphZo80cWnEXG6sTHZUEQdTaslSJu5SuPfUM+fo7e
 52/dU0nx0ZE04pwPQLHbidS4TmHlbLg9oM2kmIf9RO5rg34GodwVgRL/4+k1qvhz
 aWYJt9erFhQOpqaSX66mXHSuhvzHypbcE7d2B2Ykmh3NoYiH2w9H9KmIbbb+ZLq8
 +Bp/i5Ys/vfooo+8IE2w6KZfIzMwsmmtWjjr/38yuQJaKZCh/zn23DM9HsdrVf++
 RzfniRF4YBxmeKi7zi8MFIYys8filTCXA9dXbGSAKCuUCT37yZRnUxTeN1bn7Bux
 A7KRpG7pUKQKVKqCTndvK5LcQKlT33XyW2ZzV1wVWX2JkCJ+gilPeykb8IabNvGX
 nIp0STEGR/WdCLEAKo8pJF7Usn0RuUzAug02SG/mQ6dpnLoZqp0Od5W7gRhT7M7h
 hXr/xKJ6cG5YwicpAdy5kJJ0dRgQrtaHwxrF0B68AXZ7CmAtkPuEGCYhUCFnGQUH
 XJ0CodAqqVBRyYiQS4zIpIh2nqhIdsgv4OC1+kVLbubQk+PR88zG9Jvg6i1HQi/A
 OHi7N5Wite3YUrs3sBzDKnEc/Il2YRhVaz2SLVNfZR0PS7hywHN3rK/tVFINTgei
 jNEz1H6hu7ToNLfs0UzP
 =c28c
 -----END PGP SIGNATURE-----

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

Pull MFD bits from Samuel Ortiz:
 "We have support for a few new drivers:
   - Samsung s2mps11
   - Wolfson Microelectronics wm5102 and wm5110
   - Marvell 88PM800 and 88PM805
   - TI twl6041

  We also have our regular driver improvements:
   - Device tree and IRQ domain support for STE AB8500
   - Regmap and devm_* API conversion for TI tps6586x
   - Device tree support for Samsung max77686
   - devm_* API conversion for STE AB3100

  Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
  tps65090, da9052 and twl-core."

Fix up mostly trivial conflicts, with the exception of
drivers/usb/host/ehci-omap.c in particular, which had some
re-organization of the reset sequence (commit 1a49e2ac9651: "EHCI:
centralize controller initialization") that clashed with commit
2761a63945 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix
issues").

In particular, commit 2761a63945 moved the usb_add_hcd() to the
*middle* of the reset sequence, which clashes fairly badly with the
reset sequence re-organization (although it could have been done inside
the new omap_ehci_init() function).

I left that part of commit 2761a63945 just undone.

* tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits)
  mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core
  mfd: Arizone core should select MFD_CORE
  mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ
  mfd: Add debug trace on entering and leaving arizone runtime suspend
  mfd: Correct tps65090 cell names
  mfd: Remove gpio support from tps6586x core driver
  ARM: tegra: defconfig: Enable tps6586x gpio
  gpio: tps6586x: Add gpio support through platform driver
  mfd: Cache tps6586x register through regmap
  mfd: Use regmap for tps6586x register access.
  mfd: Use devm managed resources for tps6586x
  input: Add onkey support for 88PM80X PMIC
  mfd: Add support for twl6041
  mfd: Fix twl6040 revision information
  mfd: Matches should be NULL when populate anatop child devices
  input: ab8500-ponkey: Create AB8500 domain IRQ mapping
  mfd: Add missing out of memory check for pcf50633
  Documentation: Describe the AB8500 Device Tree bindings
  mfd: Add tps65910 32-kHz-crystal-input init
  mfd: Drop modifying mc13xxx driver's id_table in probe
  ...
 		2012-07-30 12:41:17 -07:00
..
include/mach ARM: ux500: Register the AB8500 from DB8500 MFD 2012-07-09 00:16:14 +02:00
Kconfig ARM: ux500: Kconfig: Compile in leds-gpio support for Snowball 2012-07-13 09:55:44 +02:00
Makefile arm-soc: power management changes 2012-05-22 09:41:01 -07:00
Makefile.boot ARM: ux500: Initial Device Tree support for Snowball 2012-03-16 19:46:12 +00:00
board-mop500-msp.c ARM: ux500: switch MSP to using pinctrl for pins 2012-05-11 11:14:19 +02:00
board-mop500-msp.h ARM: ux500: Add support for MSP I2S-devices 2012-04-24 10:26:47 +02:00
board-mop500-pins.c ARM: ux500: switch MSP to using pinctrl for pins 2012-05-11 11:14:19 +02:00
board-mop500-regulators.c ARM: ux500: Add audio-regulators 2012-02-29 16:32:37 +01:00
board-mop500-regulators.h mach-ux500: configure board for the TPS61052 regulator v2 2011-03-28 08:54:23 +02:00
board-mop500-sdi.c ARM: ux500: Enable Device Tree support mmci for Snowball 2012-07-13 09:55:43 +02:00
board-mop500-stuib.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500-u8500uib.c ARM: ux500: included linux/gpio.h twice 2012-02-29 16:32:38 +01:00
board-mop500-uib.c ARM: ux500: Only initialise STE's UIBs on boards which support them 2012-06-01 02:04:33 +02:00
board-mop500.c MFD bits for the 3.6 merge window. 2012-07-30 12:41:17 -07:00
board-mop500.h ARM: ux500: Enable Device Tree support mmci for Snowball 2012-07-13 09:55:43 +02:00
cache-l2x0.c Merge branch 'ux500/delete-u5500' into next/soc 2012-05-14 16:29:32 +02:00
clock.c arm-soc: sweeping late_initcall cleanup 2012-05-26 13:14:01 -07:00
clock.h ARM: ux500: use machine specific hook for late init 2012-05-08 20:36:38 +08:00
cpu-db8500.c MFD bits for the 3.6 merge window. 2012-07-30 12:41:17 -07:00
cpu.c arm-soc: sweeping late_initcall cleanup 2012-05-26 13:14:01 -07:00
cpuidle.c ARM: ux500: add the cpuidle driver for WFI and ARM retention 2012-05-02 00:44:38 +02:00
devices-common.c ARM: 7372/1: ux500: factor out dynamic amba device allocator 2012-04-19 19:31:34 +01:00
devices-common.h i2c-nomadik: turn the platform driver to an amba driver 2012-07-09 11:40:46 +02:00
devices-db8500.c mach-ux500: crypto - core support for CRYP/HASH module. 2012-05-15 17:25:32 +10:00
devices-db8500.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-05-23 15:59:10 -07:00
devices.c ux500: rework device registration 2010-12-08 13:14:06 +01:00
headsmp.S ARM: ux500: add missing ENDPROC to headsmp.S 2012-01-16 08:36:03 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
id.c ARM: ux500: core U9540 support 2012-05-02 00:25:13 +02:00
pins-db8500.h ARM: ux500: remove a bunch of internal pull-ups 2012-04-24 09:36:05 +02:00
platsmp.c Merge branch 'ux500/delete-u5500' into next/soc 2012-05-14 16:29:32 +02:00
ste-dma40-db8500.h ARM: 6418/1: ux500: rename DB8500 DMA event line macros 2010-10-04 19:46:07 +01:00
timer.c ARM: ux500: Fix build errors/warnings when MACH_UX500_DT is not set 2012-07-06 21:42:10 +02:00
usb.c ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX 2012-02-13 06:31:44 +00:00