1
0
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
linux/arch/arm/mach-s3c2440
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 ARM: S3C2440: Fix usage gpio bank j pin definitions on GTA02 2011-03-04 15:46:26 +09:00
clock.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
dma.c ARM: S3C24XX: Remove hw_addr from s3c24xx dma channel declarations 2011-09-16 15:39:43 +09:00
dsc.c ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h 2010-02-01 17:56:46 +00:00
irq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Kconfig ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIGs 2011-09-21 15:07:05 +09:00
mach-anubis.c ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-at2440evb.c ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-gta02.c ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-mini2440.c ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-nexcoder.c ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-osiris-dvs.c ARM: OSIRIS: DVS (Dynamic Voltage Scaling) supoort. 2009-12-01 01:33:49 +00:00
mach-osiris.c ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-rx1950.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-rx3715.c ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
mach-smdk2440.c ARM: mach-s3c24*: convert boot_params to atag_offset 2011-08-21 17:15:09 -04:00
Makefile ARM: S3C2440: Add HP iPAQ RX1950 machine support 2010-05-12 09:19:01 +09:00
s3c244x-clock.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
s3c244x-irq.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
s3c244x.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
s3c2440-cpufreq.c ARM: S3C2440: Fix s3c2440 cpufreq compilation post move. 2010-03-15 22:43:12 +00:00
s3c2440-pll-12000000.c ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support 2010-03-04 23:14:44 +00:00
s3c2440-pll-16934400.c ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support 2010-03-04 23:14:44 +00:00
s3c2440.c Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
s3c2442.c Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00