forked from luck/tmp_suning_uos_patched
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: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
parent
f7be9abaa5
commit
6ce8fde296
|
@ -7,14 +7,12 @@
|
||||||
|
|
||||||
config CPU_S3C6400
|
config CPU_S3C6400
|
||||||
bool
|
bool
|
||||||
select CPU_S3C6400_INIT
|
|
||||||
select CPU_S3C6400_CLOCK
|
select CPU_S3C6400_CLOCK
|
||||||
help
|
help
|
||||||
Enable S3C6400 CPU support
|
Enable S3C6400 CPU support
|
||||||
|
|
||||||
config CPU_S3C6410
|
config CPU_S3C6410
|
||||||
bool
|
bool
|
||||||
select CPU_S3C6400_INIT
|
|
||||||
select CPU_S3C6400_CLOCK
|
select CPU_S3C6400_CLOCK
|
||||||
help
|
help
|
||||||
Enable S3C6410 CPU support
|
Enable S3C6410 CPU support
|
||||||
|
|
|
@ -129,6 +129,12 @@ static struct sys_device s3c64xx_sysdev = {
|
||||||
.cls = &s3c64xx_sysclass,
|
.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 */
|
/* read cpu identification code */
|
||||||
|
|
||||||
|
|
|
@ -30,12 +30,6 @@ if PLAT_S3C64XX
|
||||||
|
|
||||||
# Configuration options shared by all S3C64XX implementations
|
# 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
|
config CPU_S3C6400_CLOCK
|
||||||
bool
|
bool
|
||||||
help
|
help
|
||||||
|
|
|
@ -12,5 +12,4 @@ obj- :=
|
||||||
|
|
||||||
# CPU support
|
# CPU support
|
||||||
|
|
||||||
obj-$(CONFIG_CPU_S3C6400_INIT) += s3c6400-init.o
|
|
||||||
obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o
|
obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
/* 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);
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user