ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/ (09ec1d7e) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1087,7 +1087,6 @@ source "arch/arm/mach-realview/Kconfig"
	source "arch/arm/mach-sa1100/Kconfig"		source "arch/arm/mach-sa1100/Kconfig"

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

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

arch/arm/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -204,7 +204,7 @@ plat-$(CONFIG_ARCH_S3C64XX) += samsung
	plat-$(CONFIG_PLAT_IOP) += iop		plat-$(CONFIG_PLAT_IOP) += iop
	plat-$(CONFIG_PLAT_ORION) += orion		plat-$(CONFIG_PLAT_ORION) += orion
	plat-$(CONFIG_PLAT_PXA) += pxa		plat-$(CONFIG_PLAT_PXA) += pxa
	plat-$(CONFIG_PLAT_S3C24XX) += s3c24xx samsung		plat-$(CONFIG_PLAT_S3C24XX) += samsung
	plat-$(CONFIG_PLAT_S5P) += samsung		plat-$(CONFIG_PLAT_S5P) += samsung
	plat-$(CONFIG_PLAT_SPEAR) += spear		plat-$(CONFIG_PLAT_SPEAR) += spear
	plat-$(CONFIG_PLAT_VERSATILE) += versatile		plat-$(CONFIG_PLAT_VERSATILE) += versatile

arch/arm/mach-s3c24xx/Kconfig

+104 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,15 @@

	if ARCH_S3C24XX		if ARCH_S3C24XX

			config PLAT_S3C24XX
			def_bool y
			select ARCH_REQUIRE_GPIOLIB
			select NO_IOPORT
			select S3C_DEV_NAND
			select IRQ_DOMAIN
			help
			Base platform code for any Samsung S3C24XX device

	menu "SAMSUNG S3C24XX SoCs Support"		menu "SAMSUNG S3C24XX SoCs Support"

	comment "S3C24XX SoCs"		comment "S3C24XX SoCs"
	@@ -83,6 +92,17 @@ config CPU_S3C2443

	# common code		# common code

			config S3C2410_CLOCK
			bool
			help
			Clock code for the S3C2410, and similar processors which
			is currently includes the S3C2410, S3C2440, S3C2442.

			config S3C24XX_DCLK
			bool
			help
			Clock code for supporting DCLK/CLKOUT on S3C24XX architectures

	config S3C24XX_SMDK		config S3C24XX_SMDK
	bool		bool
	help		help
	@@ -111,6 +131,22 @@ config S3C24XX_SETUP_TS
	help		help
	Compile in platform device definition for Samsung TouchScreen.		Compile in platform device definition for Samsung TouchScreen.

			config S3C24XX_DMA
			bool "S3C2410 DMA support"
			depends on ARCH_S3C24XX
			select S3C_DMA
			help
			S3C2410 DMA support. This is needed for drivers like sound which
			use the S3C2410's DMA system to move data to and from the
			peripheral blocks.

			config S3C2410_DMA_DEBUG
			bool "S3C2410 DMA support debug"
			depends on ARCH_S3C24XX && S3C2410_DMA
			help
			Enable debugging output for the DMA code. This option sends info
			to the kernel log, at priority KERN_DEBUG.

	config S3C2410_DMA		config S3C2410_DMA
	bool		bool
	depends on S3C24XX_DMA && (CPU_S3C2410 \|\| CPU_S3C2442)		depends on S3C24XX_DMA && (CPU_S3C2410 \|\| CPU_S3C2442)
	@@ -123,6 +159,74 @@ config S3C2410_PM
	help		help
	Power Management code common to S3C2410 and better		Power Management code common to S3C2410 and better

			# low-level serial option nodes

			config CPU_LLSERIAL_S3C2410_ONLY
			bool
			default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440

			config CPU_LLSERIAL_S3C2440_ONLY
			bool
			default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410

			config CPU_LLSERIAL_S3C2410
			bool
			help
			Selected if there is an S3C2410 (or register compatible) serial
			low-level implementation needed

			config CPU_LLSERIAL_S3C2440
			bool
			help
			Selected if there is an S3C2440 (or register compatible) serial
			low-level implementation needed

			# gpio configurations

			config S3C24XX_GPIO_EXTRA
			int
			default 128 if S3C24XX_GPIO_EXTRA128
			default 64 if S3C24XX_GPIO_EXTRA64
			default 16 if ARCH_H1940
			default 0

			config S3C24XX_GPIO_EXTRA64
			bool
			help
			Add an extra 64 gpio numbers to the available GPIO pool. This is
			available for boards that need extra gpios for external devices.

			config S3C24XX_GPIO_EXTRA128
			bool
			help
			Add an extra 128 gpio numbers to the available GPIO pool. This is
			available for boards that need extra gpios for external devices.

			# cpu frequency items common between s3c2410 and s3c2440/s3c2442

			config S3C2410_IOTIMING
			bool
			depends on CPU_FREQ_S3C24XX
			help
			Internal node to select io timing code that is common to the s3c2410
			and s3c2440/s3c2442 cpu frequency support.

			config S3C2410_CPUFREQ_UTILS
			bool
			depends on CPU_FREQ_S3C24XX
			help
			Internal node to select timing code that is common to the s3c2410
			and s3c2440/s3c244 cpu frequency support.

			# cpu frequency support common to s3c2412, s3c2413 and s3c2442

			config S3C2412_IOTIMING
			bool
			depends on CPU_FREQ_S3C24XX && (CPU_S3C2412 \|\| CPU_S3C2443)
			help
			Intel node to select io timing code that is common to the s3c2412
			and the s3c2443.

	# cpu-specific sections		# cpu-specific sections

	if CPU_S3C2410		if CPU_S3C2410

arch/arm/mach-s3c24xx/Makefile

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@ obj- :=

	# core		# core

	obj-y += common.o		obj-y += common.o irq.o

	obj-$(CONFIG_CPU_S3C2410) += s3c2410.o		obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
	obj-$(CONFIG_S3C2410_CPUFREQ) += cpufreq-s3c2410.o		obj-$(CONFIG_S3C2410_CPUFREQ) += cpufreq-s3c2410.o
	@@ -47,9 +47,21 @@ obj-$(CONFIG_PM) += pm.o irq-pm.o sleep.o

	# common code		# common code

			obj-$(CONFIG_S3C24XX_DCLK) += clock-dclk.o
			obj-$(CONFIG_S3C24XX_DMA) += dma.o

			obj-$(CONFIG_S3C2410_CLOCK) += clock-s3c2410.o
			obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += cpufreq-utils.o

			obj-$(CONFIG_S3C2410_IOTIMING) += iotiming-s3c2410.o
			obj-$(CONFIG_S3C2412_IOTIMING) += iotiming-s3c2412.o

	obj-$(CONFIG_S3C2443_COMMON) += common-s3c2443.o		obj-$(CONFIG_S3C2443_COMMON) += common-s3c2443.o
	obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o		obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o

			obj-$(CONFIG_CPU_FREQ_S3C24XX) += cpufreq.o
			obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpufreq-debugfs.o

	#		#
	# machine support		# machine support
	# following is ordered alphabetically by option text.		# following is ordered alphabetically by option text.

arch/arm/plat-s3c24xx/clock-dclk.c→arch/arm/mach-s3c24xx/clock-dclk.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	/* linux/arch/arm/plat-s3c24xx/clock-dclk.c		/*
	*
	* Copyright (c) 2004-2008 Simtec Electronics		* Copyright (c) 2004-2008 Simtec Electronics
	* Ben Dooks <ben@simtec.co.uk>		* Ben Dooks <ben@simtec.co.uk>
	* http://armlinux.simtec.co.uk/		* http://armlinux.simtec.co.uk/