Commit 2424137a authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next-exynos4' into next-exynos4-pm

parents a5abba98 30d8bead

arch/arm/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -760,8 +760,8 @@ config ARCH_S5PV210 
	help

	  Samsung S5PV210/S5PC110 series based systems



config ARCH_S5PV310

	bool "Samsung S5PV310/S5PC210"

config ARCH_EXYNOS4

	bool "Samsung EXYNOS4"

	select CPU_V7

	select ARCH_SPARSEMEM_ENABLE

	select GENERIC_GPIO
@@ -772,7 +772,7 @@ config ARCH_S5PV310 
	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	help

	  Samsung S5PV310 series based systems

	  Samsung EXYNOS4 series based systems



config ARCH_SHARK

	bool "Shark"
@@ -991,7 +991,7 @@ source "arch/arm/mach-s5pc100/Kconfig" 


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



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

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



source "arch/arm/mach-shmobile/Kconfig"
@@ -1278,7 +1278,7 @@ config SMP 
	depends on GENERIC_CLOCKEVENTS

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
@@ -1366,7 +1366,7 @@ config LOCAL_TIMERS 
	bool "Use local timer interrupts"

	depends on SMP

	default y

	select HAVE_ARM_TWD if !ARCH_MSM_SCORPIONMP

	select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT)

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system
@@ -1378,7 +1378,7 @@ source kernel/Kconfig.preempt 
config HZ

	int

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

		ARCH_S5P6442 || ARCH_S5PV210 || ARCH_S5PV310

		ARCH_S5P6442 || 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

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 
machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_S5PV310)		:= s5pv310

machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos4

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

arch/arm/configs/exynos4_defconfig

0 → 100644
+70 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_EXYNOS4=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_MACH_SMDKC210=y

CONFIG_MACH_SMDKV310=y

CONFIG_MACH_UNIVERSAL_C210=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HOTPLUG_CPU=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_SAMSUNG=y

CONFIG_SERIAL_SAMSUNG_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CRAMFS=y

CONFIG_ROMFS_FS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_BSD_DISKLABEL=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_S3C_UART=1

CONFIG_CRC_CCITT=y

arch/arm/mach-s5pv310/Kconfig→arch/arm/mach-exynos4/Kconfig

+83 −52
Original line number Diff line number Diff line 
# arch/arm/mach-s5pv310/Kconfig

# arch/arm/mach-exynos4/Kconfig

#

# Copyright (c) 2010 Samsung Electronics Co., Ltd.

# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/

#

# Licensed under GPLv2



# Configuration options for the S5PV310

# Configuration options for the EXYNOS4



if ARCH_S5PV310

if ARCH_EXYNOS4



config CPU_S5PV310

config CPU_EXYNOS4210

	bool

	select S3C_PL330_DMA

	help

	  Enable S5PV310 CPU support

	  Enable EXYNOS4210 CPU support



config S5PV310_DEV_PD

config EXYNOS4_MCT

	bool "Kernel timer support by MCT"

	help

	  Use MCT (Multi Core Timer) as kernel timers



config EXYNOS4_DEV_PD

	bool

	help

	  Compile in platform device definitions for Power Domain



config S5PV310_SETUP_I2C1

config EXYNOS4_DEV_SYSMMU

	bool

	help

	  Common setup code for SYSTEM MMU in EXYNOS4



config EXYNOS4_SETUP_I2C1

	bool

	help

	  Common setup code for i2c bus 1.



config S5PV310_SETUP_I2C2

config EXYNOS4_SETUP_I2C2

	bool

	help

	  Common setup code for i2c bus 2.



config S5PV310_SETUP_I2C3

config EXYNOS4_SETUP_I2C3

	bool

	help

	  Common setup code for i2c bus 3.



config S5PV310_SETUP_I2C4

config EXYNOS4_SETUP_I2C4

	bool

	help

	  Common setup code for i2c bus 4.



config S5PV310_SETUP_I2C5

config EXYNOS4_SETUP_I2C5

	bool

	help

	  Common setup code for i2c bus 5.



config S5PV310_SETUP_I2C6

config EXYNOS4_SETUP_I2C6

	bool

	help

	  Common setup code for i2c bus 6.



config S5PV310_SETUP_I2C7

config EXYNOS4_SETUP_I2C7

	bool

	help

	  Common setup code for i2c bus 7.



config S5PV310_SETUP_SDHCI

config EXYNOS4_SETUP_SDHCI

	bool

	select S5PV310_SETUP_SDHCI_GPIO

	select EXYNOS4_SETUP_SDHCI_GPIO

	help

	  Internal helper functions for S5PV310 based SDHCI systems.

	  Internal helper functions for EXYNOS4 based SDHCI systems.



config S5PV310_SETUP_SDHCI_GPIO

config EXYNOS4_SETUP_SDHCI_GPIO

	bool

	help

	  Common setup code for SDHCI gpio.



config S5PV310_DEV_SYSMMU

	bool

	help

	  Common setup code for SYSTEM MMU in S5PV310



# machine support



menu "S5PC210 Machines"

menu "EXYNOS4 Machines"



config MACH_SMDKC210

	bool "SMDKC210"

	select CPU_S5PV310

	select CPU_EXYNOS4210

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select S3C_DEV_I2C1
@@ -85,48 +90,74 @@ config MACH_SMDKC210 
	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S5PV310_DEV_PD

	select S5PV310_SETUP_I2C1

	select S5PV310_SETUP_SDHCI

	select S5PV310_DEV_SYSMMU

	select EXYNOS4_DEV_PD

	select EXYNOS4_DEV_SYSMMU

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_SDHCI

	help

	  Machine support for Samsung SMDKC210

	  S5PC210(MCP) is one of package option of S5PV310



config MACH_SMDKV310

	bool "SMDKV310"

	select CPU_EXYNOS4210

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select S3C_DEV_I2C1

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select EXYNOS4_DEV_PD

	select EXYNOS4_DEV_SYSMMU

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_SDHCI

	help

	  Machine support for Samsung SMDKV310



config MACH_ARMLEX4210

	bool "ARMLEX4210"

	select CPU_EXYNOS4210

	select S3C_DEV_RTC

	select S3C_DEV_WDT

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select EXYNOS4_DEV_SYSMMU

	select EXYNOS4_SETUP_SDHCI

	help

	  Machine support for Samsung ARMLEX4210 based on EXYNOS4210



config MACH_UNIVERSAL_C210

	bool "Mobile UNIVERSAL_C210 Board"

	select CPU_S5PV310

	select S5P_DEV_ONENAND

	select CPU_EXYNOS4210

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S5PV310_SETUP_SDHCI

	select S3C_DEV_I2C1

	select S5PV310_SETUP_I2C1

	select S3C_DEV_I2C5

	select S5P_DEV_ONENAND

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_SDHCI

	help

	  Machine support for Samsung Mobile Universal S5PC210 Reference

	  Board. S5PC210(MCP) is one of package option of S5PV310

	  Board.



endmenu



menu "S5PV310 Machines"



config MACH_SMDKV310

	bool "SMDKV310"

	select CPU_S5PV310

	select S3C_DEV_RTC

config MACH_NURI

	bool "Mobile NURI Board"

	select CPU_EXYNOS4210

	select S3C_DEV_WDT

	select S3C_DEV_I2C1

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S5PV310_DEV_PD

	select S5PV310_DEV_SYSMMU

	select S5PV310_SETUP_I2C1

	select S5PV310_SETUP_SDHCI

	select S3C_DEV_I2C1

	select S3C_DEV_I2C5

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_SDHCI

	select SAMSUNG_DEV_PWM

	help

	  Machine support for Samsung SMDKV310

	  Machine support for Samsung Mobile NURI Board.



endmenu
@@ -134,13 +165,13 @@ comment "Configuration for HSMMC bus width" 


menu "Use 8-bit bus width"



config S5PV310_SDHCI_CH0_8BIT

config EXYNOS4_SDHCI_CH0_8BIT

	bool "Channel 0 with 8-bit bus"

	help

	  Support HSMMC Channel 0 8-bit bus.

	  If selected, Channel 1 is disabled.



config S5PV310_SDHCI_CH2_8BIT

config EXYNOS4_SDHCI_CH2_8BIT

	bool "Channel 2 with 8-bit bus"

	help

	  Support HSMMC Channel 2 8-bit bus.

arch/arm/mach-exynos4/Makefile

0 → 100644
+52 −0
Original line number Diff line number Diff line 
# arch/arm/mach-exynos4/Makefile

#

# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/

#

# Licensed under GPLv2



obj-y				:=

obj-m				:=

obj-n				:=

obj-				:=



# Core support for EXYNOS4 system



obj-$(CONFIG_CPU_EXYNOS4210)	+= cpu.o init.o clock.o irq-combiner.o

obj-$(CONFIG_CPU_EXYNOS4210)	+= setup-i2c0.o gpiolib.o irq-eint.o dma.o

obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o



obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o



ifeq ($(CONFIG_EXYNOS4_MCT),y)

obj-y				+= mct.o

else

obj-y				+= time.o

obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o

endif



obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o



# machine support



obj-$(CONFIG_MACH_SMDKC210)		+= mach-smdkc210.o

obj-$(CONFIG_MACH_SMDKV310)		+= mach-smdkv310.o

obj-$(CONFIG_MACH_ARMLEX4210)		+= mach-armlex4210.o

obj-$(CONFIG_MACH_UNIVERSAL_C210)	+= mach-universal_c210.o

obj-$(CONFIG_MACH_NURI)			+= mach-nuri.o



# device support



obj-y					+= dev-audio.o

obj-$(CONFIG_EXYNOS4_DEV_PD)		+= dev-pd.o

obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)	+= dev-sysmmu.o



obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C2)	+= setup-i2c2.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C3)	+= setup-i2c3.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C4)	+= setup-i2c4.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C5)	+= setup-i2c5.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C6)	+= setup-i2c6.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C7)	+= setup-i2c7.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)	+= setup-sdhci.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o