kevin/linux
1
Fork 0
Code
11bc82d67d
linux/drivers/mfd
History
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
88pm860x-core.c mfd: Convert 88PM860x driver to new irq_ APIs 2011-01-14 12:37:51 +01:00
88pm860x-i2c.c
ab3100-core.c mfd: Switch AB3100 to use MFD cells 2010-10-29 00:28:42 +02:00
ab3100-otp.c mfd: Fix memory leak in ab3100_otp_probe 2010-08-12 11:27:17 +02:00
ab3550-core.c mfd: Convert AB3500 to new irq_ APIs 2011-01-14 12:37:52 +01:00
ab8500-core.c mfd: ab8500-core chip version cut 2.0 support 2011-01-14 12:38:18 +01:00
ab8500-debugfs.c mfd: Use NULL to initialise NULL pointers in ab8500-debugfs 2011-01-14 12:37:50 +01:00
ab8500-i2c.c mfd: AB8500 register access via PRCMU I2C 2010-10-29 00:29:26 +02:00
abx500-core.c mfd: kzalloc doesn't return ERR_PTR 2010-08-12 11:27:19 +02:00
adp5520.c
asic3.c mfd: Fix ASIC3 build with GENERIC_HARDIRQS_NO_DEPRECATED 2011-03-02 10:57:49 +01:00
cs5535-mfd.c mfd: Fix cs5535 warning on x86-64 2011-01-14 12:37:43 +01:00
da903x.c mfd: Fix da903x_add_subdevs error path 2010-10-29 00:28:56 +02:00
davinci_voicecodec.c mfd: Fix DaVinci voice codec device name 2011-03-02 10:57:50 +01:00
dm355evm_msp.c
ezx-pcap.c mfd: Convert ezx-pcap to new irq_ methods 2011-01-14 12:37:53 +01:00
htc-egpio.c mfd: Convert HTC EGPIO driver to irq_ API 2011-01-14 12:37:54 +01:00
htc-i2cpld.c mfd: Convert HTC I2C CPLD driver to irq_ API 2011-01-14 12:37:55 +01:00
htc-pasic3.c mfd: Remove redundant code to get htc_pasic3 irq 2010-10-29 00:29:01 +02:00
janz-cmodio.c mfd: Missing slab.h includes 2010-08-12 11:28:10 +02:00
jz4740-adc.c mfd: Convert jz4740-adc to new irq_ methods 2011-01-14 12:38:00 +01:00
Kconfig Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
lpc_sch.c
Makefile Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
max8925-core.c mfd: Convert max8925 to new irq_ API 2011-01-14 12:38:01 +01:00
max8925-i2c.c
max8998-irq.c mfd: MAX8998/LP3974 hibernation support 2011-01-14 12:38:14 +01:00
max8998.c mfd: Support LP3974 RTC 2011-01-14 12:38:16 +01:00
mc13xxx-core.c mfd: Don't open-code mc13xxx_unlock 2011-01-14 12:37:37 +01:00
mcp-core.c
mcp-sa11x0.c
menelaus.c mfd: update workqueue usages 2010-12-24 16:00:17 +01:00
mfd-core.c mfd: Provide pm_runtime_no_callbacks flag in cell data 2011-01-14 12:37:42 +01:00
omap-usb-host.c usb: host: omap: common usb host core driver 2011-03-01 17:02:22 +02:00
pcf50633-adc.c
pcf50633-core.c mfd: Fix resource reclaim in pcf50633_remove() 2010-10-29 00:30:34 +02:00
pcf50633-gpio.c
pcf50633-irq.c
rdc321x-southbridge.c
sh_mobile_sdhi.c mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc 2011-01-08 23:52:31 -05:00
sm501.c mfd: Use printf extension %pR for struct resource 2011-01-14 12:37:38 +01:00
stmpe.c mfd: Convert SMTPE driver to new irq_ APIs 2011-01-14 12:38:02 +01:00
stmpe.h mfd: Add stmpe auto sleep feature 2010-08-12 11:28:00 +02:00
t7l66xb.c mfd: Convert t7166xb driver to new irq_ API 2011-01-14 12:38:02 +01:00
tc3589x.c input/tc3589x: add tc3589x keypad support 2010-12-29 22:02:24 +01:00
tc6387xb.c mfd: Annotate tc6387xb probe/remove routines with __devinit/__devexit 2010-08-12 11:28:06 +02:00
tc6393xb.c mfd: Convert tc6393xb driver to new irq_ APIs 2011-01-14 12:38:03 +01:00
ti-ssp.c mfd: add driver for sequencer serial port 2011-03-15 08:17:22 -07:00
timberdale.c [media] mfd: Add timberdale video-in driver to timberdale 2010-12-29 08:16:46 -02:00
timberdale.h [media] mfd: Add timberdale video-in driver to timberdale 2010-12-29 08:16:46 -02:00
tmio_core.c
tps6507x.c mfd: Fix off-by-one value range checking for tps6507x 2010-10-29 00:30:29 +02:00
tps6586x.c mfd: Avoid tps6586x burst writes 2011-03-02 10:57:50 +01:00
tps65010.c mfd: Include <linux/gpio.h> instead of <asm/gpio.h> 2011-01-14 12:37:36 +01:00
twl4030-codec.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
twl4030-irq.c mfd: Convert TWL4030 to new irq_ APIs 2011-01-14 12:38:09 +01:00
twl4030-power.c mfd: Switch twl4030-power over to defines in twl.h 2010-10-29 00:28:49 +02:00
twl6030-irq.c mfd: twl6030 irq_data conversion. 2011-01-14 12:38:11 +01:00
twl6030-pwm.c mfd: Add support for TWL6030 PWM 2010-08-12 11:27:59 +02:00
twl-core.c mfd: Fix twl_probe section mismatch warning in mfd/twl-core.c 2011-01-14 12:37:48 +01:00
twl-core.h mfd: Fix twl-irq function declaration warnings 2010-10-29 00:30:16 +02:00
ucb1x00-assabet.c
ucb1x00-core.c
ucb1x00-ts.c mfd: Fix NULL pointer due to non-initialized ucb1x00-ts absinfo 2011-03-02 10:57:49 +01:00
ucb1400_core.c mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path 2010-08-12 11:28:06 +02:00
vx855.c mfd: Add __devexit annotation for vx855_remove 2011-01-14 12:38:12 +01:00
wl1273-core.c [media] MFD: WL1273 FM Radio: MFD driver for the FM radio 2010-12-29 08:17:02 -02:00
wm831x-core.c mfd: Add WM8326 support 2011-01-14 12:37:39 +01:00
wm831x-i2c.c mfd: Convert WM831x away from legacy I2C PM operations 2011-01-14 12:38:17 +01:00
wm831x-irq.c mfd: Flag WM831x /IRQ as a wake source 2011-01-14 12:38:17 +01:00
wm831x-otp.c
wm831x-spi.c mfd: Add WM8326 support 2011-01-14 12:37:39 +01:00
wm8350-core.c mfd: Fix wrong wm8350-core kfree in error path 2010-08-12 11:28:08 +02:00
wm8350-gpio.c
wm8350-i2c.c
wm8350-irq.c mfd: Convert Wolfson MFD drivers to use irq_data accessor function 2011-01-14 12:38:10 +01:00
wm8350-regmap.c
wm8400-core.c
wm8994-core.c mfd: Don't suspend WM8994 if the CODEC is not suspended 2011-03-02 10:57:50 +01:00
wm8994-irq.c mfd: Convert Wolfson MFD drivers to use irq_data accessor function 2011-01-14 12:38:10 +01:00