Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 586893eb 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/Kconfig
	arch/arm/mach-exynos4/mach-nuri.c
parents 014322da bd6356bd

Documentation/arm/Samsung/Overview.txt

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ Introduction 
  - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list

  - S3C64XX: S3C6400 and S3C6410

  - S5P6440

  - S5P6442

  - S5PC100

  - S5PC110 / S5PV210
@@ -36,7 +35,6 @@ Configuration 
  unifying all the SoCs into one kernel.



  s5p6440_defconfig - S5P6440 specific default configuration

  s5p6442_defconfig - S5P6442 specific default configuration

  s5pc100_defconfig - S5PC100 specific default configuration

  s5pc110_defconfig - S5PC110 specific default configuration

  s5pv210_defconfig - S5PV210 specific default configuration

arch/arm/Kconfig

+2 −14
Original line number Diff line number Diff line
@@ -730,16 +730,6 @@ config ARCH_S5P64X0 
	  Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,

	  SMDK6450.



config ARCH_S5P6442

	bool "Samsung S5P6442"

	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	select ARCH_USES_GETTIMEOFFSET

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S5P6442 CPU based systems



config ARCH_S5PC100

	bool "Samsung S5PC100"

	select GENERIC_GPIO
@@ -991,8 +981,6 @@ endif 


source "arch/arm/mach-s5p64x0/Kconfig"



source "arch/arm/mach-s5p6442/Kconfig"



source "arch/arm/mach-s5pc100/Kconfig"



source "arch/arm/mach-s5pv210/Kconfig"
@@ -1420,7 +1408,7 @@ source kernel/Kconfig.preempt 
config HZ

	int

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P64X0 || \

		ARCH_S5P6442 || ARCH_S5PV210 || ARCH_EXYNOS4

		ARCH_S5PV210 || ARCH_EXYNOS4

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
@@ -2028,7 +2016,7 @@ menu "Power management options" 
source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100

	depends on !ARCH_S5P64X0 && !ARCH_S5PC100

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE

	def_bool y

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c24 
machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P64X0)		:= s5p64x0

machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos4

arch/arm/common/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ config ARM_VIC 
config ARM_VIC_NR

	int

	default 4 if ARCH_S5PV210

	default 3 if ARCH_S5P6442 || ARCH_S5PC100

	default 3 if ARCH_S5PC100

	default 2

	depends on ARM_VIC

	help

arch/arm/configs/exynos4_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ CONFIG_ARCH_EXYNOS4=y 
CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_MACH_SMDKC210=y

CONFIG_MACH_SMDKV310=y

CONFIG_MACH_ARMLEX4210=y

CONFIG_MACH_UNIVERSAL_C210=y

CONFIG_MACH_NURI=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y