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

Commit 882d01f9 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable 

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
parents 64ed28a8 d608c738

arch/arm/Kconfig

+41 −9
Original line number Diff line number Diff line
@@ -631,9 +631,24 @@ config ARCH_S3C2410 


config ARCH_S3C64XX

	bool "Samsung S3C64XX"

	select PLAT_SAMSUNG

	select CPU_V6

	select GENERIC_GPIO

	select ARM_VIC

	select HAVE_CLK

	select NO_IOPORT

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select SAMSUNG_CLKSRC

	select SAMSUNG_IRQ_VIC_TIMER

	select SAMSUNG_IRQ_UART

	select S3C_GPIO_TRACK

	select S3C_GPIO_PULL_UPDOWN

	select S3C_GPIO_CFG_S3C24XX

	select S3C_GPIO_CFG_S3C64XX

	select S3C_DEV_NAND

	select USB_ARCH_HAS_OHCI

	select SAMSUNG_GPIOLIB_4BIT

	help

	  Samsung S3C64XX series based systems
@@ -645,6 +660,14 @@ config ARCH_S5P6440 
	help

	  Samsung S5P6440 CPU based systems



config ARCH_S5P6442

	bool "Samsung S5P6442"

	select CPU_V6

	select GENERIC_GPIO

	select HAVE_CLK

	help

	  Samsung S5P6442 CPU based systems



config ARCH_S5PC1XX

	bool "Samsung S5PC1XX"

	select GENERIC_GPIO
@@ -653,6 +676,15 @@ config ARCH_S5PC1XX 
	help

	  Samsung S5PC1XX series based systems



config ARCH_S5PV210

	bool "Samsung S5PV210/S5PC110"

	select CPU_V7

	select GENERIC_GPIO

	select HAVE_CLK

	select ARM_L1_CACHE_SHIFT_6

	help

	  Samsung S5PV210/S5PC110 series based systems



config ARCH_SHARK

	bool "Shark"

	select CPU_SA110
@@ -816,8 +848,6 @@ source "arch/arm/mach-sa1100/Kconfig" 


source "arch/arm/plat-samsung/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s3c64xx/Kconfig"

source "arch/arm/plat-s3c/Kconfig"

source "arch/arm/plat-s5p/Kconfig"

source "arch/arm/plat-s5pc1xx/Kconfig"
@@ -826,25 +856,27 @@ source "arch/arm/mach-s3c2400/Kconfig" 
source "arch/arm/mach-s3c2410/Kconfig"

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

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

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

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

endif



if ARCH_S3C64XX

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

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

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

endif



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



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



source "arch/arm/plat-stmp3xxx/Kconfig"

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



if ARCH_S5PC1XX

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

endif



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



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



source "arch/arm/plat-stmp3xxx/Kconfig"



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



source "arch/arm/mach-ux500/Kconfig"
@@ -1092,7 +1124,7 @@ source kernel/Kconfig.preempt 
config HZ

	int

	default 128 if ARCH_L7200

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440

	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

	default 100

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ config DEBUG_CLPS711X_UART2 
	  cause the debug messages to appear on the first serial port.



config DEBUG_S3C_UART

	depends on PLAT_S3C

	depends on PLAT_SAMSUNG

	int "S3C UART to use for low-level debug"

	default "0"

	help

arch/arm/Makefile

+8 −6
Original line number Diff line number Diff line
@@ -160,11 +160,13 @@ machine-$(CONFIG_ARCH_PNX4008) := pnx4008 
machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443

machine-$(CONFIG_ARCH_S3C2410)		:= s3c2410 s3c2400 s3c2412 s3c2440 s3c2443

machine-$(CONFIG_ARCH_S3C24A0)		:= s3c24a0

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c6400 s3c6410

machine-$(CONFIG_ARCH_S3C64XX)		:= s3c64xx

machine-$(CONFIG_ARCH_S5P6440)		:= s5p6440

machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC1XX)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile
@@ -180,15 +182,15 @@ machine-$(CONFIG_FOOTBRIDGE) := footbridge 
# by CONFIG_* macro name.

plat-$(CONFIG_ARCH_MXC)		:= mxc

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_S3C64XX)	:= samsung

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

plat-$(CONFIG_PLAT_ORION)	:= orion

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx s3c samsung

plat-$(CONFIG_PLAT_S3C64XX)	:= s3c64xx s3c samsung

plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx s3c samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung s3c

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung

plat-$(CONFIG_PLAT_S5PC1XX)	:= s5pc1xx samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung



ifeq ($(CONFIG_ARCH_EBSA110),y)

# This is what happens if you forget the IOCS16 line.

arch/arm/configs/s3c6400_defconfig

+264 −96

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/s5p6442_defconfig

0 → 100644
+883 −0

File added.

Preview size limit exceeded, changes collapsed.