2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
linux-next/arch/arm/mach-s5p64x0/include/mach
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
..
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dma.h ARM: S5P64X0: Use generic DMA PL330 driver 2011-09-14 11:10:03 +05:30
entry-macro.S ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
i2c.h ARM: S5P64X0: Add S5P6450 I2C support 2010-10-18 18:33:03 +09:00
io.h ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
irqs.h ARM: S5P64X0: Add register base and IRQ for Framebuffer 2011-10-04 19:00:39 +09:00
map.h ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
pm-core.h ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
regs-clock.h ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
regs-gpio.h ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
regs-irq.h ARM: S5P64X0: Update IRQ support 2010-10-18 18:33:03 +09:00
s5p64x0-clock.h ARM: S5P64X0: Update Clock for S5P6440 and S5P6450 2010-10-18 18:33:02 +09:00
spi-clocks.h ARM: S5P64X0: Update Audio support 2010-10-18 18:33:03 +09:00
system.h ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
tick.h ARM: S5P64X0: Update Timer support 2010-10-18 18:33:03 +09:00
timex.h ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
vmalloc.h ARM: S5P: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:50 +09:00