Commit 3fa754c2 authored by Kukjin Kim's avatar Kukjin Kim Committed by Russell King
Browse files

ARM: 7248/1: S5PV210: introduce arch/arm/mach-s5pv210/common.[ch] 



This patch introduces common.[ch] which are used only in the
arch/arm/mach-s5pv210/ directory. The common.c file merges
the cpu.c and init.c which are used commonly on S5PCV210/S5PC100
SoC and the common.h local header file replaces with plat/s5pv210.h
file.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent dd4153d9

arch/arm/mach-s5pv210/Makefile

+11 −8
Original line number Diff line number Diff line
@@ -10,18 +10,20 @@ obj-m := 
obj-n				:=

obj-				:=



# Core support for S5PV210 system

# Core



obj-y				+= common.o clock.o



obj-$(CONFIG_CPU_S5PV210)	+= cpu.o init.o clock.o dma.o

obj-$(CONFIG_CPU_S5PV210)	+= setup-i2c0.o

obj-$(CONFIG_PM)		+= pm.o



obj-y				+= dma.o



# machine support



obj-$(CONFIG_MACH_AQUILA)	+= mach-aquila.o

obj-$(CONFIG_MACH_SMDKV210)	+= mach-smdkv210.o

obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o

obj-$(CONFIG_MACH_GONI)		+= mach-goni.o

obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o

obj-$(CONFIG_MACH_SMDKV210)	+= mach-smdkv210.o

obj-$(CONFIG_MACH_TORBRECK)	+= mach-torbreck.o



# device support
@@ -29,6 +31,7 @@ obj-$(CONFIG_MACH_TORBRECK) += mach-torbreck.o 
obj-y				+= dev-audio.o

obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o



obj-y					+= setup-i2c0.o

obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)	+= setup-fb-24bpp.o

obj-$(CONFIG_S5PV210_SETUP_FIMC)	+= setup-fimc.o

obj-$(CONFIG_S5PV210_SETUP_I2C1)	+= setup-i2c1.o

arch/arm/mach-s5pv210/clock.c

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
#include <plat/pll.h>

#include <plat/s5p-clock.h>

#include <plat/clock-clksrc.h>

#include <plat/s5pv210.h>



#include "common.h"



static unsigned long xtal;

arch/arm/mach-s5pv210/cpu.c→arch/arm/mach-s5pv210/common.c

+95 −14
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pv210/cpu.c

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

/*

 * Copyright (c) 2009-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Common Codes for S5PV210

 *

 * 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.
@@ -21,33 +22,75 @@ 
#include <linux/platform_device.h>

#include <linux/sched.h>

#include <linux/dma-mapping.h>

#include <linux/serial_core.h>



#include <asm/proc-fns.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/irq.h>



#include <asm/proc-fns.h>

#include <mach/map.h>

#include <mach/regs-clock.h>



#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/clock.h>

#include <plat/fb-core.h>

#include <plat/s5pv210.h>

#include <plat/devs.h>

#include <plat/reset.h>

#include <plat/sdhci.h>

#include <plat/adc-core.h>

#include <plat/ata-core.h>

#include <plat/fb-core.h>

#include <plat/fimc-core.h>

#include <plat/iic-core.h>

#include <plat/keypad-core.h>

#include <plat/sdhci.h>

#include <plat/reset.h>

#include <plat/tv-core.h>

#include <plat/regs-serial.h>



#include "common.h"



static const char name_s5pv210[] = "S5PV210/S5PC110";



static struct cpu_table cpu_ids[] __initdata = {

	{

		.idcode		= S5PV210_CPU_ID,

		.idmask		= S5PV210_CPU_MASK,

		.map_io		= s5pv210_map_io,

		.init_clocks	= s5pv210_init_clocks,

		.init_uarts	= s5pv210_init_uarts,

		.init		= s5pv210_init,

		.name		= name_s5pv210,

	},

};



/* Initial IO mappings */



static struct map_desc s5pv210_iodesc[] __initdata = {

	{

		.virtual	= (unsigned long)S5P_VA_CHIPID,

		.pfn		= __phys_to_pfn(S5PV210_PA_CHIPID),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_SYS,

		.pfn		= __phys_to_pfn(S5PV210_PA_SYSCON),

		.length		= SZ_64K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_TIMER,

		.pfn		= __phys_to_pfn(S5PV210_PA_TIMER),

		.length		= SZ_16K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S3C_VA_WATCHDOG,

		.pfn		= __phys_to_pfn(S5PV210_PA_WATCHDOG),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_SROMC,

		.pfn		= __phys_to_pfn(S5PV210_PA_SROMC),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_SYSTIMER,

		.pfn		= __phys_to_pfn(S5PV210_PA_SYSTIMER),

		.length		= SZ_4K,
@@ -113,14 +156,27 @@ static void s5pv210_sw_reset(void) 
	__raw_writel(0x1, S5P_SWRESET);

}



/* s5pv210_map_io

/*

 * s5pv210_map_io

 *

 * register the standard cpu IO areas

 */



void __init s5pv210_map_io(void)

void __init s5pv210_init_io(struct map_desc *mach_desc, int size)

{

	/* initialize the io descriptors we need for initialization */

	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));

	if (mach_desc)

		iotable_init(mach_desc, size);



	/* detect cpu id and rev. */

	s5p_init_cpu(S5P_VA_CHIPID);



	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));

}



void __init s5pv210_map_io(void)

{

	init_consistent_dma_size(14 << 20);



	/* initialise device information early */
@@ -186,7 +242,6 @@ static int __init s5pv210_core_init(void) 
{

	return sysdev_class_register(&s5pv210_sysclass);

}



core_initcall(s5pv210_core_init);



int __init s5pv210_init(void)
@@ -201,3 +256,29 @@ int __init s5pv210_init(void) 


	return sysdev_register(&s5pv210_sysdev);

}



static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {

	[0] = {

		.name		= "pclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	},

};



/* uart registration process */



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

{

	struct s3c2410_uartcfg *tcfg = cfg;

	u32 ucnt;



	for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {

		if (!tcfg->clocks) {

			tcfg->clocks = s5pv210_serial_clocks;

			tcfg->clocks_size = ARRAY_SIZE(s5pv210_serial_clocks);

		}

	}



	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);

}

arch/arm/plat-samsung/include/plat/s5pv210.h→arch/arm/mach-s5pv210/common.h

+35 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-samsung/include/plat/s5pv210.h

/*

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *

 * Header file for s5pv210 cpu support

 * Common Header for S5PV210 machines

 *

 * 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.

 */



/* Common init code for S5PV210 related SoCs */

#ifndef __ARCH_ARM_MACH_S5PV210_COMMON_H

#define __ARCH_ARM_MACH_S5PV210_COMMON_H



void s5pv210_init_io(struct map_desc *mach_desc, int size);

void s5pv210_init_irq(void);



extern void s5pv210_common_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s5pv210_register_clocks(void);

extern void s5pv210_setup_clocks(void);

void s5pv210_register_clocks(void);

void s5pv210_setup_clocks(void);



#ifdef CONFIG_CPU_S5PV210



extern  int s5pv210_init(void);

extern void s5pv210_init_irq(void);

extern void s5pv210_map_io(void);

extern void s5pv210_init_clocks(int xtal);



#define s5pv210_init_uarts s5pv210_common_init_uarts

extern void s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no);



#else

#define s5pv210_init_clocks NULL
@@ -31,3 +31,5 @@ extern void s5pv210_init_clocks(int xtal); 
#define s5pv210_map_io NULL

#define s5pv210_init NULL

#endif



#endif /* __ARCH_ARM_MACH_S5PV210_COMMON_H */

arch/arm/mach-s5pv210/init.c

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pv210/init.c

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *

 * 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 <linux/serial_core.h>



#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/s5pv210.h>

#include <plat/regs-serial.h>



static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {

	[0] = {

		.name		= "pclk",

		.divisor	= 1,

		.min_baud	= 0,

		.max_baud	= 0,

	},

};



/* uart registration process */

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

{

	struct s3c2410_uartcfg *tcfg = cfg;

	u32 ucnt;



	for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {

		if (!tcfg->clocks) {

			tcfg->clocks = s5pv210_serial_clocks;

			tcfg->clocks_size = ARRAY_SIZE(s5pv210_serial_clocks);

		}

	}



	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE