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

Commit 6ce8fde2 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: S3C64XX: Merge s3c6400-init.c into cpu.c 



Since this file is small, and is compiled for both systems in this
architecture merge it into the cpu support file and remove the original
instead of moving it.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent f7be9aba

arch/arm/mach-s3c64xx/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -7,14 +7,12 @@ 


config CPU_S3C6400

	bool

	select CPU_S3C6400_INIT

	select CPU_S3C6400_CLOCK

	help

	  Enable S3C6400 CPU support



config CPU_S3C6410

	bool

	select CPU_S3C6400_INIT

	select CPU_S3C6400_CLOCK

	help

	  Enable S3C6410 CPU support

arch/arm/mach-s3c64xx/cpu.c

+6 −0
Original line number Diff line number Diff line
@@ -129,6 +129,12 @@ static struct sys_device s3c64xx_sysdev = { 
	.cls	= &s3c64xx_sysclass,

};



/* uart registration process */



void __init s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)

{

	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);

}



/* read cpu identification code */

arch/arm/plat-s3c64xx/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -30,12 +30,6 @@ if PLAT_S3C64XX 


# Configuration options shared by all S3C64XX implementations



config CPU_S3C6400_INIT

	bool

	help

	  Common initialisation code for the S3C6400 that is shared

	  by other CPUs in the series, such as the S3C6410.



config CPU_S3C6400_CLOCK

	bool

	help

arch/arm/plat-s3c64xx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,5 +12,4 @@ obj- := 


# CPU support



obj-$(CONFIG_CPU_S3C6400_INIT)	+= s3c6400-init.o

obj-$(CONFIG_CPU_S3C6400_CLOCK)	+= s3c6400-clock.o

arch/arm/plat-s3c64xx/s3c6400-init.c

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-s3c64xx/s3c6400-init.c

 *

 * Copyright 2008 Openmoko, Inc.

 * Copyright 2008 Simtec Electronics

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

 *      http://armlinux.simtec.co.uk/

 *

 * S3C6400 - CPU initialisation (common with other S3C64XX chips)

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/init.h>



#include <plat/cpu.h>

#include <plat/devs.h>

#include <mach/s3c6400.h>

#include <mach/s3c6410.h>



/* uart registration process */



void __init s3c6400_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)

{

	s3c24xx_init_uartdevs("s3c6400-uart", s3c64xx_uart_resources, cfg, no);

}