1
linux/arch/arm/mach-s5pc100
Linus Torvalds 7abec10c62 Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc
* 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
  ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
  ARM: SAMSUNG: Cleanup resources by using macro
  ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
  ARM: S5P: To merge devs.c files to one devs.c
  ARM: S3C64XX: To merge devs.c files to one devs.c
  ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
  ARM: S5P64X0: Add Power Management support
  ARM: S5P: Make the sleep code common for S5P series SoCs
  ARM: S5P: Make the common S5P PM code conditionally compile
  ARM: SAMSUNG: Move S5P header files to plat-samsung
  ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
  ARM: SAMSUNG: Moving each SoC support header files
  ARM: SAMSUNG: Consolidate plat/pll.h
  ARM: SAMSUNG: Consolidate plat/pwm-clock.h
  ARM: SAMSUNG: Cleanup mach/clkdev.h
  ARM: SAMSUNG: remove sdhci default configuration setup platform helper
  ARM: EXYNOS4: Add FIMC device on SMDKV310 board
  ARM: EXYNOS4: Add header file protection macros
  ARM: EXYNOS4: Add usb ehci device to the SMDKV310
  ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
  ...

Fix up conflicts in
 - arch/arm/mach-exynos4/{Kconfig,clock.c}
	ARM_CPU_SUSPEND, various random device tables (gah!)
 - drivers/gpio/Makefile
	sa1100 gpio added, samsung gpio drivers merged
2011-11-05 18:18:05 -07:00
..
include/mach Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
clock.c Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung 2011-09-19 10:30:49 +09:00
cpu.c ARM: S5P: Moves initial map for merging S5P64X0 2010-10-18 10:33:34 +09:00
dev-audio.c ASoC: Samsung: Rename AC97 platform device 2010-11-23 14:05:29 +00:00
dev-spi.c Merge branch 'for-spi' into s5p-fixes-for-linus 2011-07-06 15:46:41 +09:00
dma.c ARM: S5PC100: register the second instance of pl330 DMAC 2011-09-19 10:27:26 +09:00
init.c ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
Kconfig ARM: S5PC100: Use generic DMA PL330 driver 2011-09-14 11:10:03 +05:30
mach-smdkc100.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
Makefile gpio: Move the s5pc100 GPIO to drivers/gpio 2011-05-26 17:33:41 -06:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
setup-fb-24bpp.c ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100 2011-07-21 02:11:30 +09:00
setup-i2c0.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:59 +09:00
setup-i2c1.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:59 +09:00
setup-ide.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:15 +09:00
setup-keypad.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:15 +09:00
setup-sdhci-gpio.c ARM: S5PC100: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:41 +09:00
setup-sdhci.c ARM: SAMSUNG: remove sdhci default configuration setup platform helper 2011-10-04 19:48:40 +09:00