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
Showing
- arch/arm/Kconfig 1 addition, 4 deletionsarch/arm/Kconfig
- arch/arm/mach-exynos4/Kconfig 38 additions, 0 deletionsarch/arm/mach-exynos4/Kconfig
- arch/arm/mach-exynos4/Makefile 1 addition, 1 deletionarch/arm/mach-exynos4/Makefile
- arch/arm/mach-exynos4/clock.c 201 additions, 3 deletionsarch/arm/mach-exynos4/clock.c
- arch/arm/mach-exynos4/cpu.c 2 additions, 0 deletionsarch/arm/mach-exynos4/cpu.c
- arch/arm/mach-exynos4/dma.c 1 addition, 0 deletionsarch/arm/mach-exynos4/dma.c
- arch/arm/mach-exynos4/include/mach/clkdev.h 0 additions, 7 deletionsarch/arm/mach-exynos4/include/mach/clkdev.h
- arch/arm/mach-exynos4/include/mach/irqs.h 4 additions, 0 deletionsarch/arm/mach-exynos4/include/mach/irqs.h
- arch/arm/mach-exynos4/include/mach/map.h 12 additions, 0 deletionsarch/arm/mach-exynos4/include/mach/map.h
- arch/arm/mach-exynos4/include/mach/pm-core.h 7 additions, 1 deletionarch/arm/mach-exynos4/include/mach/pm-core.h
- arch/arm/mach-exynos4/include/mach/pmu.h 7 additions, 0 deletionsarch/arm/mach-exynos4/include/mach/pmu.h
- arch/arm/mach-exynos4/include/mach/regs-pmu.h 63 additions, 11 deletionsarch/arm/mach-exynos4/include/mach/regs-pmu.h
- arch/arm/mach-exynos4/mach-nuri.c 34 additions, 0 deletionsarch/arm/mach-exynos4/mach-nuri.c
- arch/arm/mach-exynos4/mach-origen.c 574 additions, 3 deletionsarch/arm/mach-exynos4/mach-origen.c
- arch/arm/mach-exynos4/mach-smdkv310.c 49 additions, 0 deletionsarch/arm/mach-exynos4/mach-smdkv310.c
- arch/arm/mach-exynos4/mach-universal_c210.c 300 additions, 7 deletionsarch/arm/mach-exynos4/mach-universal_c210.c
- arch/arm/mach-exynos4/pm.c 7 additions, 0 deletionsarch/arm/mach-exynos4/pm.c
- arch/arm/mach-exynos4/pmu.c 204 additions, 149 deletionsarch/arm/mach-exynos4/pmu.c
- arch/arm/mach-exynos4/setup-sdhci.c 0 additions, 47 deletionsarch/arm/mach-exynos4/setup-sdhci.c
- arch/arm/mach-s3c2410/Kconfig 0 additions, 1 deletionarch/arm/mach-s3c2410/Kconfig
Loading
Please register or sign in to comment