S3C2416: move io-init to SoC specific files
From: Heiko Stuebner <heiko@...> Date: Thu, 5 Jan 2012 14:10:20 +0100
Commit-Message
Introduce common.h/common.c to replace calls to s3c24xx_init_io and make the s3c2416.h header obsolete. This also removes a cpu-specific ifdef in the common init function. Signed-off-by: Heiko Stuebner <heiko@...>
Patch-Comment
arch/arm/mach-s3c2416/Makefile | 2 +- arch/arm/mach-s3c2416/clock.c | 3 +- arch/arm/mach-s3c2416/common.c | 70 ++++++++++++++++++++++++++ arch/arm/mach-s3c2416/common.h | 30 +++++++++++ arch/arm/mach-s3c2416/mach-smdk2416.c | 6 ++- arch/arm/mach-s3c2416/s3c2416.c | 3 +- arch/arm/plat-s3c24xx/cpu.c | 21 -------- arch/arm/plat-samsung/include/plat/s3c2416.h | 33 ------------ 8 files changed, 109 insertions(+), 59 deletions(-) create mode 100644 arch/arm/mach-s3c2416/common.c create mode 100644 arch/arm/mach-s3c2416/common.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2416.h
Statistics
- 109 lines added
- 59 lines removed
Changes
------------------------ arch/arm/mach-s3c2416/Makefile ------------------------
index ca0cd22..841cb48 100644
@@ -9,7 +9,7 @@ obj-m :=
obj-n :=
obj- :=
+obj-$(CONFIG_CPU_S3C2416) += s3c2416.o clock.o common.o
obj-$(CONFIG_CPU_S3C2416) += irq.o
obj-$(CONFIG_S3C2416_PM) += pm.o
#obj-$(CONFIG_S3C2416_DMA) += dma.o
------------------------ arch/arm/mach-s3c2416/clock.c -------------------------
index 5e36905..414d482 100644
@@ -14,7 +14,6 @@
#include <linux/init.h>
#include <linux/clk.h>
#include <plat/clock.h>
#include <plat/clock-clksrc.h>
#include <plat/cpu.h>
@@ -27,6 +26,8 @@
#include <mach/regs-clock.h>
#include <mach/regs-s3c2443-clock.h>
+#include "common.h"
+
/* armdiv
*
* this clock is sourced from msysclk and can have a number of
------------------------ arch/arm/mach-s3c2416/common.c ------------------------
new file mode 100644
index 0000000..0d08cec
@@ -0,0 +1,70 @@
+/*
+ * S3C2416 CPU Support
+ *
+ * Copyright (c) 2004-2005 Simtec Electronics
+ * http://www.simtec.co.uk/products/SWLINUX/
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include <linux/init.h>
+#include <linux/module.h>
+
+#include <asm/mach/map.h>
+
+#include <plat/cpu.h>
+
+#include <mach/map.h>
+#include <mach/regs-gpio.h>
+
+#include "common.h"
+
+/* table of supported CPUs */
+
+static const char name_s3c2416[] = "S3C2416/S3C2450";
+
+static struct cpu_table cpu_ids[] __initdata = {
+ { /* a strange version of the s3c2416 */
+ .idcode = 0x32450003,
+ .idmask = 0xffffffff,
+ .map_io = s3c2416_map_io,
+ .init_clocks = s3c2416_init_clocks,
+ .init_uarts = s3c2416_init_uarts,
+ .init = s3c2416_init,
+ .name = name_s3c2416,
+ },
+};
+
+/* minimal IO mapping */
+
+static struct map_desc s3c_iodesc[] __initdata = {
+ IODESC_ENT(GPIO),
+ IODESC_ENT(IRQ),
+ IODESC_ENT(MEMCTRL),
+ IODESC_ENT(UART)
+};
+
+void __init s3c2416_init_io(struct map_desc *mach_desc, int size)
+{
+ /* initialise the io descriptors we need for initialisation */
+ iotable_init(mach_desc, size);
+ iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
+
+ samsung_cpu_id = __raw_readl(S3C24XX_GSTATUS1);
+ s3c24xx_init_cpu();
+
+ s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
+}
------------------------ arch/arm/mach-s3c2416/common.h ------------------------
new file mode 100644
index 0000000..027b95b
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2009 Yauhen Kharuzhy <jekhor@gmail.com>
+ *
+ * Header file for s3c2416 cpu support
+ *
+ * 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.
+*/
+
+#ifndef __ARCH_ARM_MACH_S3C2416_COMMON_H
+#define __ARCH_ARM_MACH_S3C2416_COMMON_H
+
+struct s3c2410_uartcfg;
+
+extern int s3c2416_init(void);
+
+extern void s3c2416_map_io(void);
+
+extern void s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no);
+
+extern void s3c2416_init_clocks(int xtal);
+
+extern int s3c2416_baseclk_add(void);
+
+extern void s3c2416_restart(char mode, const char *cmd);
+
+extern void s3c2416_init_io(struct map_desc *mach_desc, int size);
+
+#endif
-------------------- arch/arm/mach-s3c2416/mach-smdk2416.c ---------------------
index 66b7173..516eed1 100644
@@ -42,7 +42,6 @@
#include <mach/leds-gpio.h>
#include <plat/iic.h>
#include <plat/gpio-cfg.h>
#include <plat/clock.h>
#include <plat/devs.h>
@@ -56,6 +55,8 @@
#include <plat/common-smdk.h>
+#include "common.h"
+
static struct map_desc smdk2416_iodesc[] __initdata = {
/* ISA IO Space map (memory space selected by A24) */
@@ -215,7 +216,8 @@ static struct platform_device *smdk2416_devices[] __initdata = {
static void __init smdk2416_map_io(void)
{
+ s3c2416_init_io(smdk2416_iodesc, ARRAY_SIZE(smdk2416_iodesc));
+
s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(smdk2416_uartcfgs, ARRAY_SIZE(smdk2416_uartcfgs));
}
----------------------- arch/arm/mach-s3c2416/s3c2416.c ------------------------
index 0f4fdea..22ceb26 100644
@@ -50,7 +50,6 @@
#include <plat/gpio-core.h>
#include <plat/gpio-cfg.h>
#include <plat/gpio-cfg-helpers.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/sdhci.h>
@@ -62,6 +61,8 @@
#include <plat/adc-core.h>
#include <plat/rtc-core.h>
+#include "common.h"
+
static struct map_desc s3c2416_iodesc[] __initdata = {
IODESC_ENT(WATCHDOG),
IODESC_ENT(CLKPWR),
------------------------- arch/arm/plat-s3c24xx/cpu.c --------------------------
index 4e4db00..7532026 100644
@@ -47,7 +47,6 @@
#include <plat/clock.h>
#include <plat/s3c2410.h>
#include <plat/s3c2412.h>
#include <plat/s3c244x.h>
#include <plat/s3c2443.h>
@@ -55,7 +54,6 @@
static const char name_s3c2410[] = "S3C2410";
static const char name_s3c2412[] = "S3C2412";
static const char name_s3c2440[] = "S3C2440";
static const char name_s3c2442[] = "S3C2442";
static const char name_s3c2442b[] = "S3C2442B";
@@ -136,15 +134,6 @@ static struct cpu_table cpu_ids[] __initdata = {
.init = s3c2412_init,
.name = name_s3c2412,
},
{
.idcode = 0x32443001,
.idmask = 0xffffffff,
@@ -169,16 +158,6 @@ static struct map_desc s3c_iodesc[] __initdata = {
static unsigned long s3c24xx_read_idcode_v5(void)
{
#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
return __raw_readl(S3C2412_GSTATUS1);
#else
----------------- arch/arm/plat-samsung/include/plat/s3c2416.h -----------------
deleted file mode 100644
index de2b5bd..0000000
@@ -1,33 +0,0 @@