kevin/linux
1
Fork 0
Code
6513fd6972
linux/drivers/gpio
History
Linus Torvalds a0a4194c94 Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 
* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c
2011-11-03 09:40:51 -07:00
..
gpio-74x164.c gpio/74x164: fix clash with gpiolib namespace 2011-06-13 09:03:48 -06:00
gpio-ab8500.c gpio: ab8500: fix MODULE_ALIAS for ab8500 2011-07-28 16:19:23 -06:00
gpio-adp5520.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-adp5588.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-bt8xx.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
gpio-cs5535.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-da9052.c gpio/da9052: remove a redundant assignment for gpio->da9052 2011-07-14 12:41:53 +09:00
gpio-davinci.c ARM: 7074/1: gpio: davinci: eliminate unused variable warnings 2011-09-05 11:26:34 +01:00
gpio-ep93xx.c ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics 2011-10-01 23:37:34 +01:00
gpio-exynos4.c Merge branch 'gpio/next-tegra' into gpio/next 2011-06-15 14:57:39 -06:00
gpio-generic.c drivers/gpio/gpio-generic.c: fix build errors 2011-09-14 18:09:38 -07:00
gpio-it8761e.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-janz-ttl.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-ks8695.c ARM: 7036/1: mach-ks8695: break out GPIO driver specifics 2011-08-22 09:12:54 +01:00
gpio-langwell.c gpio: langwell: ensure alternate function is cleared 2011-10-06 04:14:52 -06:00
gpio-lpc32xx.c ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics 2011-08-22 09:13:21 +01:00
gpio-max730x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-max732x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-max7300.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-max7301.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-mc33880.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-mcp23s08.c mcp23s08: add i2c support 2011-07-15 13:54:18 -06:00
gpio-ml-ioh.c gpio-ml-ioh: Use NUMA_NO_NODE not GFP_KERNEL 2011-10-19 19:01:34 -06:00
gpio-mpc5200.c gpio: Move mpc5200 gpio driver to drivers/gpio 2011-07-06 11:57:15 -06:00
gpio-msm-v1.c gpio_msm: Move Qualcomm v6 MSM driver into drivers 2011-08-01 04:58:00 -07:00
gpio-msm-v2.c gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers 2011-08-01 04:58:00 -07:00
gpio-mxc.c Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:11:00 -07:00
gpio-mxs.c gpio/mxs: move irq_to_gpio() into gpio-mxs driver 2011-08-17 08:33:02 +02:00
gpio-nomadik.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-10-29 07:27:45 -07:00
gpio-omap.c Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 2011-10-27 08:39:10 +02:00
gpio-pca953x.c gpio-pca953x: fix gpio_base 2011-10-13 13:49:37 -06:00
gpio-pcf857x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-pch.c gpio-pch: Use NUMA_NO_NODE not GFP_KERNEL 2011-10-19 19:01:29 -06:00
gpio-pl061.c gpio: pl061: add DT binding support 2011-10-26 23:15:28 +02:00
gpio-plat-samsung.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-pxa.c Merge branch 'depends/rmk/gpio' into next/fixes 2011-10-31 22:44:18 +01:00
gpio-rdc321x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-s5pc100.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-s5pv210.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-sa1100.c ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem 2011-08-22 09:13:44 +01:00
gpio-sch.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-stmpe.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-sx150x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-tc3589x.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-tegra.c Merge branch 'depends/rmk/gpio' into next/devel 2011-10-31 23:46:42 +01:00
gpio-timberdale.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-tnetv107x.c ARM: 7039/1: mach-davinci: move DaVinci TNET GPIO driver to GPIO subsystem 2011-08-22 09:12:55 +01:00
gpio-tps65910.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
gpio-tps65912.c tps65912: gpio: add gpio driver 2011-07-31 23:28:22 +02:00
gpio-twl4030.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-u300.c ARM: 7083/1: rewrite U300 GPIO to use gpiolib 2011-09-08 10:03:56 +01:00
gpio-ucb1400.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-vr41xx.c gpio/vr41xx: Convert use of struct resource to resource_size(ptr) 2011-06-10 23:37:10 -06:00
gpio-vx855.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-wm831x.c Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 2011-07-22 14:50:57 -07:00
gpio-wm8350.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-wm8994.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpio-xilinx.c gpio: reorganize drivers 2011-06-06 10:10:11 -06:00
gpiolib.c gpio: make gpio_{request,free}_array gpio array parameter const 2011-05-27 17:56:45 -06:00
Kconfig Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
Makefile ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem 2011-10-01 23:41:41 +01:00