litmus-rt.git/arch/arm/mach-s5p6440/Kconfig, branch wip-d10-hz1000

Merge branch 'next-samsung' into for-next

2010-08-06T12:49:18+00:00

Conflicts:
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/cpu.c
	arch/arm/plat-samsung/include/plat/sdhci.h

ARM: SAMSUNG: Make WDT driver dependency SoC specific instead of machine specific

2010-08-06T12:26:56+00:00

This patch moves the dependency of watchdog timer driver from MACH_XXX(board)
to ARCH_XXX(SoC). This will enable all machines using Samsung S3C64XX and S5P
SoCs to use the WDT driver by default.

Signed-off-by: Banajit Goswami 
Signed-off-by: Kukjin Kim 

Conflicts:

	arch/arm/Kconfig
	arch/arm/mach-s3c64xx/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig

ARM: S5P6440: Add support for I2C channel 0 and 1 on SMDK6440

2010-08-06T10:32:43+00:00

This patch adds helper functions for I2C channel 0 and 1, GPIO
configurations for I2C on S5P6440 and support I2C-0/1 devices
on SMDK6440.

Signed-off-by: Naveen Krishna Ch 
Signed-off-by: Kukjin Kim 

Conflicts:

	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6440/include/mach/map.h
	arch/arm/mach-s5p6440/mach-smdk6440.c

ARM: S5P6440: Add RTC support for S5P6440

2010-08-05T09:30:32+00:00

This patch adds support RTC driver for Samsung S5P6440.

Signed-off-by: Atul Dahiya 
Signed-off-by: Kukjin Kim

ARM: Merge for-2635-4/watchdog

2010-05-20T10:51:40+00:00

Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6440/include/mach/map.h
	arch/arm/mach-s5p6440/mach-smdk6440.c
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/include/mach/map.h
	arch/arm/mach-s5pv210/mach-smdkv210.c

ARM: S5P6440: Add Watchdog support for S5P6440

2010-05-20T10:46:43+00:00

This patch adds support for Watchdog timer for Samsung S5P6440.

Signed-off-by: Banajit Goswami 
Signed-off-by: Kukjin Kim 
Signed-off-by: Ben Dooks

ARM: S5P6440: Add Touchscreen support for S5P6440

2010-05-20T05:15:21+00:00

This patch adds touchscreen support for S5P6440.

Signed-off-by: Naveen Krishna Ch 
[ben-linux@fluff.org: minor header fix]
Signed-off-by: Ben Dooks

S5P6440: DMA: Add platform devices for PL330 DMACs

2010-05-18T09:00:12+00:00

Samsung's Soc S5P6440 has one PL330 DMAC.
Define and add the PL330 DMAC as platform device on the
S5P6440 platform.

Signed-off-by: Jassi Brar 
Signed-off-by: Ben Dooks

ARM: S5P6440: Move CPU specific code in plat-s5p to machine directory

2010-01-27T00:50:11+00:00

The s5p6440-clock.c and s5p6440-init.c code in the plat-s5p is specific to
s5p6440 SoC based systems. So these files are being moved to the machine
directory of s5p6440. And these files are renamed in the machine directory.

Signed-off-by: Kukjin Kim 
Signed-off-by: Ben Dooks

ARM: S5P6440: Add new Kconfig and Makefiles

2010-01-15T10:16:32+00:00

This patch adds the Kconfig and Makefile for the new S5P6440 machine
and platform directories. It also updates arch/arm Kconfig and Makefiles
to include the support for the new S5P6440 CPU.

Signed-off-by: Kukjin Kim 
Signed-off-by: Ben Dooks