Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 20:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
7ec8af9e34
linux/arch/arm/mach-s3c64xx
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
..
include/mach ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
clock.c ARM: S3C64XX: Add clock for i2c1 2011-03-04 15:46:26 +09:00
cpu.c ARM: S3C64XX: Merge s3c6400-init.c into cpu.c 2010-02-20 22:34:01 +00:00
cpufreq.c ARM: S3C64XX: Fix section mismatch from cpufreq init 2011-03-15 20:38:10 +09:00
dev-audio.c ASoC: Samsung: Rename AC97 platform device 2010-11-23 14:05:29 +00:00
dev-onenand1.c ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
dev-spi.c ARM: S3C64XX: Prototype SPI devices 2010-09-18 09:54:54 +09:00
dev-uart.c ARM: S3C64XX: Move device and device setup into mach-s3c64xx 2010-02-20 22:32:01 +00:00
dma.c ARM: S3C64XX: Reduce output of s3c64xx_dma_init1() 2011-03-04 15:46:27 +09:00
gpiolib.c ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions 2011-03-04 15:46:26 +09:00
irq-eint.c ARM: S3C64XX: Use chip_data to store the shift for EINTs 2010-12-30 09:36:52 +09:00
irq-pm.c ARM: S3C64XX: Move IRQ support into mach-s3c64xx 2010-02-20 22:32:00 +00:00
irq.c ARM: S3C64XX: Move IRQ support into mach-s3c64xx 2010-02-20 22:32:00 +00:00
Kconfig ARM: SAMSUNG: Add PWM backlight support on Samsung S3C6410 2011-03-03 10:10:07 +09:00
mach-anw6410.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-hmt.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mini6410.c ARM: S3C64XX: fix uart clock setup for mini6410/real6410 2010-11-25 10:58:11 +09:00
mach-ncp.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-real6410.c ARM: S3C64XX: fix uart clock setup for mini6410/real6410 2010-11-25 10:58:11 +09:00
mach-smartq5.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-smartq7.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-smartq.c ARM: 6351/1: s3c64xx: don't put smartq_bl_init in .init.text 2010-09-02 16:36:07 +01:00
mach-smartq.h ARM: S3C6410: Add basic support for SmartQ machines 2010-05-20 19:42:15 +09:00
mach-smdk6400.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-smdk6410.c Merge branch 'dev/pwm-backlight' into for-next 2011-03-11 15:48:52 +09:00
Makefile ARM: S3C64XX: add support for mach-mini6410 2010-10-21 07:42:29 +09:00
Makefile.boot
pm.c ARM: S3C64XX: PM: Synchronise wakeup mask on suspend 2010-05-20 21:07:08 +09:00
s3c6400.c ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
s3c6410.c ARM: SAMSUNG: Implement set_name function for ADC devices 2010-08-05 18:32:50 +09:00
setup-fb-24bpp.c ARM: S3C64XX: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:07 +09:00
setup-i2c0.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
setup-i2c1.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h for Samsung SoCs 2010-08-06 21:28:44 +09:00
setup-ide.c ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped 2010-10-25 16:04:33 +09:00
setup-keypad.c ARM: S3C64XX: Fix keypad setup to configure correct number of rows 2011-03-04 15:46:26 +09:00
setup-sdhci-gpio.c ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:37 +09:00
setup-sdhci.c ARM: S3C64XX: Tone down SDHCI debugging 2011-03-04 15:46:27 +09:00
sleep.S ARM: pm: convert samsung platforms to generic suspend/resume support 2011-02-22 17:11:25 +00:00