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

Commit 8c3d7c30 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx 



S3C-SoCs starting with the S3C2443 can share a lot of functionality.
The file can collect more common code of these SocS later on and
therefore gets a new name to reflect this future purpose.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 8fe2ff76

arch/arm/mach-s3c24xx/Kconfig

+12 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ config CPU_S3C2416 
	select CPU_ARM926T

	select CPU_LLSERIAL_S3C2440

	select SAMSUNG_CLKSRC

	select S3C2443_CLOCK

	select S3C2443_COMMON

	select S3C2416_DMA if S3C24XX_DMA

	select S3C2416_PM if PM

	help
@@ -76,7 +76,7 @@ config CPU_S3C2443 
	select CPU_ARM920T

	select CPU_LLSERIAL_S3C2440

	select SAMSUNG_CLKSRC

	select S3C2443_CLOCK

	select S3C2443_COMMON

	select S3C2443_DMA if S3C24XX_DMA

	help

	  Support for the S3C2443 SoC from the S3C24XX line
@@ -471,6 +471,16 @@ config SMDK2440_CPU2442 


endif	# CPU_S3C2440



if CPU_S3C2443 || CPU_S3C2416



config S3C2443_COMMON

	bool

	help

	  Common code for the S3C2443 and similar processors, which includes

	  the S3C2416 and S3C2450.



endif	# CPU_S3C2443 || CPU_S3C2416



if CPU_S3C2443



config S3C2443_DMA

arch/arm/mach-s3c24xx/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o 
obj-$(CONFIG_CPU_S3C2443)	+= s3c2443.o irq-s3c2443.o clock-s3c2443.o

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



# common code



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



#

# machine support

# following is ordered alphabetically by option text.

arch/arm/plat-s3c24xx/s3c2443-clock.c→arch/arm/mach-s3c24xx/common-s3c2443.c

+13 −4
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c24xx/s3c2443-clock.c

/*

 * Common code for SoCs starting with the S3C2443

 *

 * Copyright (c) 2007, 2010 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * S3C2443 Clock control suport - common code

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/init.h>

arch/arm/plat-s3c24xx/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -44,12 +44,6 @@ config S3C2410_CLOCK 
	  Clock code for the S3C2410, and similar processors which

	  is currently includes the S3C2410, S3C2440, S3C2442.



config S3C2443_CLOCK

	bool

	help

	  Clock code for the S3C2443 and similar processors, which includes

	  the S3C2416 and S3C2450.



config S3C24XX_DCLK

	bool

	help

arch/arm/plat-s3c24xx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ obj-$(CONFIG_PM) += pm.o 
obj-$(CONFIG_PM)		+= irq-pm.o

obj-$(CONFIG_PM)		+= sleep.o

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

obj-$(CONFIG_S3C2443_CLOCK)	+= s3c2443-clock.o

obj-$(CONFIG_S3C24XX_DMA)	+= dma.o

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

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