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

Commit 6b8eda04 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next-s5pv310' into for-next

parents a639718b 516607d6

arch/arm/Kconfig

+19 −5
Original line number Diff line number Diff line
@@ -704,6 +704,15 @@ config ARCH_S5PV210 
	help

	  Samsung S5PV210/S5PC110 series based systems



config ARCH_S5PV310

	bool "Samsung S5PV310/S5PC210"

	select CPU_V7

	select GENERIC_GPIO

	select HAVE_CLK

	select GENERIC_CLOCKEVENTS

	help

	  Samsung S5PV310 series based systems



config ARCH_SHARK

	bool "Shark"

	select CPU_SA110
@@ -904,6 +913,8 @@ source "arch/arm/mach-s5pc100/Kconfig" 


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



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



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



source "arch/arm/plat-stmp3xxx/Kconfig"
@@ -1100,10 +1111,11 @@ config SMP 
	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

		 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310)

	depends on GENERIC_CLOCKEVENTS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\

			ARCH_S5PV310)

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If
@@ -1172,9 +1184,10 @@ config HOTPLUG_CPU 
config LOCAL_TIMERS

	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || ARCH_U8500)

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		ARCH_U8500 || ARCH_S5PV310)

	default y

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500)

	select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_S5PV310)

	help

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

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

	int

	default 128 if ARCH_L7200

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

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

		       ARCH_S5PV210 || ARCH_S5PV310

	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER

	default AT91_TIMER_HZ if ARCH_AT91

	default 100

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ machine-$(CONFIG_ARCH_S5P6440) := s5p6440 
machine-$(CONFIG_ARCH_S5P6442)		:= s5p6442

machine-$(CONFIG_ARCH_S5PC100)		:= s5pc100

machine-$(CONFIG_ARCH_S5PV210)		:= s5pv210

machine-$(CONFIG_ARCH_S5PV310)		:= s5pv310

machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

arch/arm/mach-s5pv310/Kconfig

0 → 100644
+45 −0
Original line number Diff line number Diff line 
# arch/arm/mach-s5pv310/Kconfig

#

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

#		http://www.samsung.com/

#

# Licensed under GPLv2



# Configuration options for the S5PV310



if ARCH_S5PV310



config CPU_S5PV310

	bool

	select PLAT_S5P

	help

	  Enable S5PV310 CPU support



config S5PV310_SETUP_I2C1

	bool

	help

	  Common setup code for i2c bus 1.



config S5PV310_SETUP_I2C2

	bool

	help

	  Common setup code for i2c bus 2.



# machine support



config MACH_SMDKV310

	bool "SMDKV310"

	select CPU_S5PV310

	select ARCH_SPARSEMEM_ENABLE

	help

	  Machine support for Samsung SMDKV310



config MACH_UNIVERSAL_C210

	bool "Mobile UNIVERSAL_C210 Board"

	select CPU_S5PV310

	select ARCH_SPARSEMEM_ENABLE

	help

	  Machine support for Samsung Mobile Universal S5PC210 Reference

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



endif

arch/arm/mach-s5pv310/Makefile

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

#

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

#		http://www.samsung.com/

#

# Licensed under GPLv2



obj-y				:=

obj-m				:=

obj-n				:=

obj-				:=



# Core support for S5PV310 system



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

obj-$(CONFIG_CPU_S5PV310)	+= setup-i2c0.o time.o



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

obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o

obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o



# machine support



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

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



# device support



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

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

arch/arm/mach-s5pv310/Makefile.boot

0 → 100644
+2 −0
Original line number Diff line number Diff line 
   zreladdr-y	:= 0x40008000

params_phys-y	:= 0x40000100