korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-22 18:44:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
91ba548cfd
linux/arch/arm/mach-exynos
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 1a49e2ac96: "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-soc: device tree description updates 2012-07-23 16:17:43 -07:00
clock-exynos4.c ARM: arm-soc soc updates, take 2 2012-07-30 09:45:53 -07:00
clock-exynos4.h ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file 2012-07-17 07:52:03 +09:00
clock-exynos5.c ARM: EXYNOS: Add spi clock support for EXYNOS5 2012-07-14 10:57:10 +09:00
clock-exynos4210.c ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file 2012-07-17 07:52:03 +09:00
clock-exynos4212.c ARM: EXYNOS: Add G2D related clock entries for SMDK4X12 2012-07-17 07:52:03 +09:00
common.c arm-soc: soc-specific updates 2012-07-23 16:08:40 -07:00
common.h ARM: exynos: use machine specific hook for late init 2012-05-08 20:35:33 +08:00
cpuidle.c Merge branch 'late/soc' into devel-late 2012-05-30 16:06:46 -07:00
dev-ahci.c ARM: EXYNOS: Use common macro to define resources on dev-ahci.c 2012-05-12 16:12:19 +09:00
dev-audio.c ARM: EXYNOS: Use common macro to define resources on dev-audio.c 2012-05-12 16:12:20 +09:00
dev-drm.c ARM: EXYNOS: add platform device for core DRM subsystem 2012-05-12 06:42:33 +09:00
dev-dwmci.c ARM: EXYNOS: Fix resource on dev-dwmci.c 2012-04-24 13:50:00 -07:00
dev-ohci.c ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00
dev-sysmmu.c ARM: EXYNOS: Change System MMU platform device definitions 2012-04-04 09:23:02 -07:00
dev-uart.c ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5 2012-03-14 02:13:05 -07:00
dma.c ARM: EXYNOS: Support DMA for EXYNOS5250 SoC 2012-05-13 08:20:04 +09:00
headsmp.S ARM: exynos: remove incorrect BSYM usage 2012-01-16 08:36:04 -06:00
hotplug.c ARM: move CP15 definitions to separate header file 2012-03-28 18:30:01 +01:00
Kconfig ARM: EXYNOS: Add DRM device to SMDK4X12 board 2012-07-19 14:41:01 +09:00
mach-armlex4210.c arm-soc: sweeping late_initcall cleanup 2012-05-26 13:14:01 -07:00
mach-exynos4-dt.c ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4 2012-07-14 10:57:09 +09:00
mach-exynos5-dt.c ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5 2012-07-14 10:57:11 +09:00
mach-nuri.c MFD bits for the 3.6 merge window. 2012-07-30 12:41:17 -07:00
mach-origen.c MFD bits for the 3.6 merge window. 2012-07-30 12:41:17 -07:00
mach-smdk4x12.c ARM: EXYNOS: Add DRM device to SMDK4X12 board 2012-07-19 14:41:01 +09:00
mach-smdkv310.c arm-soc: board specific updates 2012-07-23 17:34:48 -07:00
mach-universal_c210.c arm-soc: board specific updates 2012-07-23 17:34:48 -07:00
Makefile ARM: EXYNOS: Add PMU table for EXYNOS5250 2012-05-20 03:13:17 +09:00
Makefile.boot ARM: EXYNOS: add dts files to dtbs target 2012-05-12 06:42:07 +09:00
mct.c ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition 2012-05-15 16:59:33 +09:00
platsmp.c ARM: EXYNOS: add support get_core_count() for EXYNOS5250 2012-03-14 02:35:15 -07:00
pm_domains.c ARM: EXYNOS: register devices in 'need_restore' state for pm_domains 2012-07-12 17:29:55 +09:00
pm.c ARM: EXYNOS: Support suspend and resume for EXYNOS5250 2012-05-20 03:14:36 +09:00
pmu.c ARM: EXYNOS: Add missing static storage class specifier in pmu.c file 2012-07-13 06:46:08 +09:00
setup-fimc.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-fimd0.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c0.c ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5 2012-03-14 02:13:04 -07:00
setup-i2c1.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c2.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c3.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c4.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c5.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c6.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-i2c7.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-keypad.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-sdhci-gpio.c ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
setup-spi.c ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions 2012-07-13 15:23:46 +09:00
setup-usb-phy.c ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12 2012-07-13 06:45:55 +09:00