Commit f9cef506 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of... 

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/mach-s3c64xx/dev-audio.c
parents 9ae21ca3 cbff3eb3

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -727,9 +727,11 @@ config ARCH_S5PC100 
config ARCH_S5PV210

	bool "Samsung S5PV210/S5PC110"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select GENERIC_GPIO

	select HAVE_CLK

	select ARM_L1_CACHE_SHIFT_6

	select ARCH_HAS_CPUFREQ

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_I2C

	select HAVE_S3C_RTC
@@ -740,9 +742,13 @@ config ARCH_S5PV210 
config ARCH_S5PV310

	bool "Samsung S5PV310/S5PC210"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select GENERIC_GPIO

	select HAVE_CLK

	select GENERIC_CLOCKEVENTS

	select HAVE_S3C_RTC

	select HAVE_S3C2410_I2C

	select HAVE_S3C2410_WATCHDOG

	help

	  Samsung S5PV310 series based systems

arch/arm/include/asm/hardware/cache-l2x0.h

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ 
#define L2X0_LINE_DATA			0xF10

#define L2X0_LINE_TAG			0xF30

#define L2X0_DEBUG_CTRL			0xF40

#define L2X0_PREFETCH_CTRL		0xF60

#define L2X0_POWER_CTRL			0xF80

#define   L2X0_DYNAMIC_CLK_GATING_EN	(1 << 1)

#define   L2X0_STNDBY_MODE_EN		(1 << 0)



#ifndef __ASSEMBLY__

extern void __init l2x0_init(void __iomem *base, __u32 aux_val, __u32 aux_mask);

arch/arm/mach-s3c2410/include/mach/gpio.h

+7 −3
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 


#ifdef CONFIG_CPU_S3C244X

#define ARCH_NR_GPIOS	(32 * 9 + CONFIG_S3C24XX_GPIO_EXTRA)

#elif defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)

#define ARCH_NR_GPIOS	(32 * 12 + CONFIG_S3C24XX_GPIO_EXTRA)

#else

#define ARCH_NR_GPIOS	(256 + CONFIG_S3C24XX_GPIO_EXTRA)

#endif
@@ -30,8 +32,10 @@ 
#include <mach/gpio-nrs.h>

#include <mach/gpio-fns.h>



#ifdef CONFIG_CPU_S3C24XX

#define S3C_GPIO_END	(S3C2410_GPIO_BANKJ + 32)

#ifdef CONFIG_CPU_S3C244X

#define S3C_GPIO_END	(S3C2410_GPJ(0) + 32)

#elif defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)

#define S3C_GPIO_END	(S3C2410_GPM(0) + 32)

#else

#define S3C_GPIO_END	(S3C2410_GPIO_BANKH + 32)

#define S3C_GPIO_END	(S3C2410_GPH(0) + 32)

#endif

arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ 
#define S3C2443_SCLKCON_UARTCLK		(1<<8)

#define S3C2443_SCLKCON_USBHOST		(1<<1)



#define S3C2443_PWRCFG_SLEEP		(1<<15)



#include <asm/div64.h>



static inline unsigned int

arch/arm/mach-s3c2410/include/mach/vmalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
#ifndef __ASM_ARCH_VMALLOC_H

#define __ASM_ARCH_VMALLOC_H



#define VMALLOC_END	0xE0000000UL

#define VMALLOC_END	0xF6000000UL



#endif /* __ASM_ARCH_VMALLOC_H */