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

Commit 85e2a26f authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C2412: move mach-s3c2412/* into mach-s3c24xx/ 



This patch moves S3C2412 stuff into mach-s3c24xx/ directory
so that we can merge the s3c24 series' directories to the
just one mach-s3c24xx/ directory.

And this patch is including following.
- re-ordered alphabetically by option text at Kconfig and Makefile

Cc: Ben Dooks <ben-linux@fluff.org>
[heiko@sntech.de: move 'config S3C2412_PM_SLEEP' to use it for S3C2416]
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 85fd6d63

arch/arm/mach-s3c2412/Kconfig

+0 −85
Original line number Diff line number Diff line
@@ -2,41 +2,6 @@ 
#

# Licensed under GPLv2



config CPU_S3C2412

	bool

	depends on ARCH_S3C24XX

	select CPU_ARM926T

	select CPU_LLSERIAL_S3C2440

	select S3C2412_PM if PM

	select S3C2412_DMA if S3C2410_DMA

	help

	  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line



config CPU_S3C2412_ONLY

	bool

	depends on ARCH_S3C24XX && !CPU_S3C2410 && \

		   !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \

		   !CPU_S3C2443 && CPU_S3C2412

	default y if CPU_S3C2412



config S3C2412_DMA

	bool

	depends on CPU_S3C2412

	help

	  Internal config node for S3C2412 DMA support



config S3C2412_PM

	bool

	select S3C2412_PM_SLEEP

	help

	  Internal config node to apply S3C2412 power management



config S3C2412_PM_SLEEP

	bool

	help

	  Internal config node to apply sleep for S3C2412 power management.

	  Can be selected by another SoCs with similar sleep procedure.



# Note, the S3C2412 IOtiming support is in plat-s3c24xx



config S3C2412_CPUFREQ
@@ -46,53 +11,3 @@ config S3C2412_CPUFREQ 
	default y

	help

	  CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
 


menu "S3C2412 Machines"



config MACH_JIVE

	bool "Logitech Jive"

	select CPU_S3C2412

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the Logitech Jive.



config MACH_JIVE_SHOW_BOOTLOADER

	bool "Allow access to bootloader partitions in MTD (EXPERIMENTAL)"

	depends on MACH_JIVE && EXPERIMENTAL



config MACH_SMDK2413

	bool "SMDK2413"

	select CPU_S3C2412

	select MACH_S3C2413

	select MACH_SMDK

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using an SMDK2413



config MACH_S3C2413

	bool

	help

	  Internal node for S3C2413 version of SMDK2413, so that

	  machine_is_s3c2413() will work when MACH_SMDK2413 is

	  selected



config MACH_SMDK2412

	bool "SMDK2412"

	select MACH_SMDK2413

	help

	  Say Y here if you are using an SMDK2412



	  Note, this shares support with SMDK2413, so will automatically

	  select MACH_SMDK2413.



config MACH_VSTMS

	bool "VMSTMS"

	select CPU_S3C2412

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using an VSTMS board



endmenu

arch/arm/mach-s3c2412/Makefile

+0 −12
Original line number Diff line number Diff line
@@ -9,16 +9,4 @@ obj-m := 
obj-n				:=

obj-				:=



obj-$(CONFIG_CPU_S3C2412)	+= s3c2412.o

obj-$(CONFIG_CPU_S3C2412)	+= irq.o

obj-$(CONFIG_CPU_S3C2412)	+= clock.o

obj-$(CONFIG_S3C2412_DMA)	+= dma.o

obj-$(CONFIG_S3C2412_PM)	+= pm.o

obj-$(CONFIG_S3C2412_PM_SLEEP)	+= sleep.o

obj-$(CONFIG_S3C2412_CPUFREQ)	+= cpu-freq.o
 


# Machine support



obj-$(CONFIG_MACH_JIVE)		+= mach-jive.o

obj-$(CONFIG_MACH_SMDK2413)	+= mach-smdk2413.o

obj-$(CONFIG_MACH_VSTMS)	+= mach-vstms.o

arch/arm/mach-s3c24xx/Kconfig

+89 −1
Original line number Diff line number Diff line
@@ -25,11 +25,21 @@ config CPU_S3C2410 
	  Support for S3C2410 and S3C2410A family from the S3C24XX line

	  of Samsung Mobile CPUs.



config CPU_S3C2412

	bool "SAMSUNG S3C2412"

	depends on ARCH_S3C24XX

	select CPU_ARM926T

	select CPU_LLSERIAL_S3C2440

	select S3C2412_PM if PM

	select S3C2412_DMA if S3C24XX_DMA

	help

	  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line



if CPU_S3C2410



config S3C2410_DMA

	bool

	depends on S3C2410_DMA && CPU_S3C2410

	depends on S3C24XX_DMA && CPU_S3C2410

	default y if CPU_S3C2410

	help

	  DMA device selection for S3C2410 and compatible CPUs
@@ -160,6 +170,84 @@ config MACH_VR1000 


endif	# CPU_S3C2410



config S3C2412_PM_SLEEP

	bool

	help

	  Internal config node to apply sleep for S3C2412 power management.

	  Can be selected by another SoCs such as S3C2416 with similar

	  sleep procedure.



if CPU_S3C2412



config CPU_S3C2412_ONLY

	bool

	depends on ARCH_S3C24XX && !CPU_S3C2410 && \

		   !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \

		   !CPU_S3C2443 && CPU_S3C2412

	default y



config S3C2412_DMA

	bool

	help

	  Internal config node for S3C2412 DMA support



config S3C2412_PM

	bool

	help

	  Internal config node to apply S3C2412 power management



comment "S3C2412 Boards"



#

# The "S3C2412 Boards" list is ordered alphabetically by option text.

# (without ARCH_ or MACH_)

#



config MACH_JIVE

	bool "Logitech Jive"

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using the Logitech Jive.



config MACH_JIVE_SHOW_BOOTLOADER

	bool "Allow access to bootloader partitions in MTD (EXPERIMENTAL)"

	depends on MACH_JIVE && EXPERIMENTAL



config MACH_S3C2413

	bool

	help

	  Internal node for S3C2413 version of SMDK2413, so that

	  machine_is_s3c2413() will work when MACH_SMDK2413 is

	  selected



config MACH_SMDK2412

	bool "SMDK2412"

	select MACH_SMDK2413

	help

	  Say Y here if you are using an SMDK2412



	  Note, this shares support with SMDK2413, so will automatically

	  select MACH_SMDK2413.



config MACH_SMDK2413

	bool "SMDK2413"

	select MACH_S3C2413

	select MACH_SMDK

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using an SMDK2413



config MACH_VSTMS

	bool "VMSTMS"

	select S3C_DEV_USB_HOST

	select S3C_DEV_NAND

	help

	  Say Y here if you are using an VSTMS board



endif	# CPU_S3C2412



endmenu	# SAMSUNG S3C24XX SoCs Support



endif	# ARCH_S3C24XX

arch/arm/mach-s3c24xx/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ obj-$(CONFIG_CPU_S3C2410) += s3c2410.o 
obj-$(CONFIG_S3C2410_DMA)	+= dma-s3c2410.o

obj-$(CONFIG_S3C2410_PM)	+= pm-s3c2410.o sleep-s3c2410.o



obj-$(CONFIG_CPU_S3C2412)	+= s3c2412.o irq-s3c2412.o clock-s3c2412.o

obj-$(CONFIG_S3C2412_DMA)	+= dma-s3c2412.o

obj-$(CONFIG_S3C2412_PM)	+= pm-s3c2412.o

obj-$(CONFIG_S3C2412_PM_SLEEP)	+= sleep-s3c2412.o



#

# machine support

# following is ordered alphabetically by option text.
@@ -36,6 +41,10 @@ obj-$(CONFIG_ARCH_SMDK2410) += mach-smdk2410.o 
obj-$(CONFIG_MACH_TCT_HAMMER)		+= mach-tct_hammer.o

obj-$(CONFIG_MACH_VR1000)		+= mach-vr1000.o usb-simtec.o



obj-$(CONFIG_MACH_JIVE)			+= mach-jive.o

obj-$(CONFIG_MACH_SMDK2413)		+= mach-smdk2413.o

obj-$(CONFIG_MACH_VSTMS)		+= mach-vstms.o



# common bits of machine support



obj-$(CONFIG_SIMTEC_NOR)		+= nor-simtec.o