iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ca90666287
linux/arch/arm/mach-exynos4
History
Linus Torvalds ca90666287 Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm 
* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
2011-10-27 08:39:10 +02:00
..
include/mach 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
clock.c ARM: EXYNOS4: Rename sclk_cam clocks for FIMC driver 2011-09-27 07:00:59 +09:00
cpu.c ARM: EXYNOS4: Add restart hook for proper reboot 2011-08-19 21:21:08 +09:00
cpuidle.c ARM: EXYNOS4: CPUIDLE Support 2011-05-06 09:36:47 +09:00
dev-ahci.c ARM: EXYNOS4: Add support for SATA on ARMLEX4210 2011-03-15 18:35:30 +09:00
dev-audio.c ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
dev-dwmci.c ARM: EXYNOS4: Add platform device for dwmci driver 2011-07-21 01:46:43 +09:00
dev-pd.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
dev-sysmmu.c ARM: EXYNOS4: Implement Clock gating for System MMU 2011-03-15 21:37:38 +09:00
dma.c
headsmp.S ARM: EXYNOS4: Address a section mismatch w/ suspend issue. 2011-07-06 08:43:03 +09:00
hotplug.c ARM: EXYNOS4: Add support Core1 Power On/Off with hotplug in/out 2011-07-20 23:36:19 +09:00
init.c ARM: SAMSUNG: serial: Fix on handling of one clock source for UART 2011-06-07 09:25:34 -07:00
irq-combiner.c ARM: s5pv310: update IRQ combiner to use chained entry/exit functions 2011-05-11 16:04:15 +01:00
irq-eint.c ARM: EXYNOS4: add required chained_irq_enter/exit to eint code 2011-08-19 20:57:37 +09:00
Kconfig ARM: pm: let platforms select cpu_suspend support 2011-10-01 21:09:39 +02:00
mach-armlex4210.c ARM: EXYNOS4: Add support for SATA on ARMLEX4210 2011-03-15 18:35:30 +09:00
mach-nuri.c ARM: EXYNOS4: Enable MFC on Samsung NURI 2011-07-21 17:29:20 +09:00
mach-smdkc210.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mach-smdkv310.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
mach-universal_c210.c ARM: EXYNOS4: Use the correct regulator names on universal_c210 2011-08-19 20:57:20 +09:00
Makefile Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mct.c ARM: EXYNOS4: restart clocksource while system resumes 2011-09-15 13:59:58 +09:00
platsmp.c Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus 2011-10-25 08:19:29 +01:00
pm.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
pmu.c ARM: EXYNOS4: Support system level power down configuration 2011-07-20 23:38:07 +09:00
setup-fimc.c ARM: S5P: Add platform helpers for camera GPIO configuration 2011-03-11 15:49:00 +09:00
setup-fimd0.c ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +09:00
setup-i2c0.c
setup-i2c1.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c2.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c3.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c4.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c5.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c6.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-i2c7.c ARM: EXYNOS4: Update device support 2011-02-22 13:51:15 +09:00
setup-keypad.c ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines 2011-09-15 15:54:20 +09:00
setup-sdhci-gpio.c Fix common misspellings 2011-03-31 11:26:23 -03:00
setup-sdhci.c Fix common misspellings 2011-03-31 11:26:23 -03:00
setup-usb-phy.c ARM: EXYNOS4: Increase reset delay for USB HOST PHY 2011-08-19 20:57:39 +09:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00