S3C2440: move io-init to SoC specific files
From: Heiko Stuebner <heiko@...> Date: Thu, 5 Jan 2012 15:30:09 +0100
Commit-Message
Introduce common.c to replace calls to s3c24xx_init_io and make the s3c244x.h header obsolete. Signed-off-by: Heiko Stuebner <heiko@...>
Patch-Comment
arch/arm/mach-s3c2440/Makefile | 2 +- arch/arm/mach-s3c2440/common.c | 100 ++++++++++++++++++++++++++ arch/arm/mach-s3c2440/common.h | 20 +++++ arch/arm/mach-s3c2440/dsc.c | 2 +- arch/arm/mach-s3c2440/mach-anubis.c | 2 +- arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- arch/arm/mach-s3c2440/mach-gta02.c | 2 +- arch/arm/mach-s3c2440/mach-mini2440.c | 2 +- arch/arm/mach-s3c2440/mach-nexcoder.c | 3 +- arch/arm/mach-s3c2440/mach-osiris.c | 2 +- arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- arch/arm/mach-s3c2440/mach-smdk2440.c | 3 +- arch/arm/mach-s3c2440/s3c2440.c | 3 +- arch/arm/mach-s3c2440/s3c2442.c | 3 +- arch/arm/mach-s3c2440/s3c244x.c | 3 +- arch/arm/plat-s3c24xx/cpu.c | 41 ----------- arch/arm/plat-samsung/include/plat/s3c244x.h | 42 ----------- 18 files changed, 137 insertions(+), 99 deletions(-) create mode 100644 arch/arm/mach-s3c2440/common.c delete mode 100644 arch/arm/plat-samsung/include/plat/s3c244x.h
Statistics
- 137 lines added
- 99 lines removed
Changes
------------------------ arch/arm/mach-s3c2440/Makefile ------------------------
index d5440fa..b7b76fa 100644
@@ -9,7 +9,7 @@ obj-m :=
obj-n :=
obj- :=
+obj-$(CONFIG_CPU_S3C2440) += s3c2440.o dsc.o common.o
obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
obj-$(CONFIG_CPU_S3C2440) += irq.o
------------------------ arch/arm/mach-s3c2440/common.c ------------------------
new file mode 100644
index 0000000..a8f1bb6
@@ -0,0 +1,100 @@
+/*
+ * S3C244X 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_s3c2440[] = "S3C2440";
+static const char name_s3c2442[] = "S3C2442";
+static const char name_s3c2442b[] = "S3C2442B";
+static const char name_s3c2440a[] = "S3C2440A";
+
+static struct cpu_table cpu_ids[] __initdata = {
+ {
+ .idcode = 0x32440000,
+ .idmask = 0xffffffff,
+ .map_io = s3c2440_map_io,
+ .init_clocks = s3c244x_init_clocks,
+ .init_uarts = s3c244x_init_uarts,
+ .init = s3c2440_init,
+ .name = name_s3c2440
+ },
+ {
+ .idcode = 0x32440001,
+ .idmask = 0xffffffff,
+ .map_io = s3c2440_map_io,
+ .init_clocks = s3c244x_init_clocks,
+ .init_uarts = s3c244x_init_uarts,
+ .init = s3c2440_init,
+ .name = name_s3c2440a
+ },
+ {
+ .idcode = 0x32440aaa,
+ .idmask = 0xffffffff,
+ .map_io = s3c2442_map_io,
+ .init_clocks = s3c244x_init_clocks,
+ .init_uarts = s3c244x_init_uarts,
+ .init = s3c2442_init,
+ .name = name_s3c2442
+ },
+ {
+ .idcode = 0x32440aab,
+ .idmask = 0xffffffff,
+ .map_io = s3c2442_map_io,
+ .init_clocks = s3c244x_init_clocks,
+ .init_uarts = s3c244x_init_uarts,
+ .init = s3c2442_init,
+ .name = name_s3c2442b
+ },
+};
+
+/* minimal IO mapping */
+
+static struct map_desc s3c_iodesc[] __initdata = {
+ IODESC_ENT(GPIO),
+ IODESC_ENT(IRQ),
+ IODESC_ENT(MEMCTRL),
+ IODESC_ENT(UART)
+};
+
+void __init s3c244x_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(S3C2410_GSTATUS1);
+ s3c24xx_init_cpu();
+
+ s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
+}
------------------------ arch/arm/mach-s3c2440/common.h ------------------------
index db8a98a..5debd8b 100644
@@ -12,6 +12,26 @@
#ifndef __ARCH_ARM_MACH_S3C2440_COMMON_H
#define __ARCH_ARM_MACH_S3C2440_COMMON_H
+extern void s3c244x_map_io(void);
+
+extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);
+
+extern void s3c244x_init_clocks(int xtal);
+
void s3c2440_restart(char mode, const char *cmd);
+extern void s3c244x_init_io(struct map_desc *mach_desc, int size);
+
+#ifdef CONFIG_CPU_S3C2440
+extern int s3c2440_init(void);
+
+extern void s3c2440_map_io(void);
+#endif
+
+#ifdef CONFIG_CPU_S3C2442
+extern int s3c2442_init(void);
+
+extern void s3c2442_map_io(void);
+#endif
+
#endif /* __ARCH_ARM_MACH_S3C2440_COMMON_H */
------------------------- arch/arm/mach-s3c2440/dsc.c --------------------------
index 9ea66e3..a0e9fa5 100644
@@ -28,7 +28,7 @@
#include <mach/regs-dsc.h>
#include <plat/cpu.h>
+#include "common.h"
int s3c2440_set_dsc(unsigned int pin, unsigned int value)
{
--------------------- arch/arm/mach-s3c2440/mach-anubis.c ----------------------
index 2456955..0c16578 100644
@@ -450,7 +450,7 @@ static void __init anubis_map_io(void)
s3c24xx_register_clocks(anubis_clocks, ARRAY_SIZE(anubis_clocks));
+ s3c244x_init_io(anubis_iodesc, ARRAY_SIZE(anubis_iodesc));
s3c24xx_init_clocks(0);
s3c24xx_init_uarts(anubis_uartcfgs, ARRAY_SIZE(anubis_uartcfgs));
-------------------- arch/arm/mach-s3c2440/mach-at2440evb.c --------------------
index d6a9763..65010c5 100644
@@ -200,7 +200,7 @@ static struct platform_device *at2440evb_devices[] __initdata = {
static void __init at2440evb_map_io(void)
{
+ s3c244x_init_io(at2440evb_iodesc, ARRAY_SIZE(at2440evb_iodesc));
s3c24xx_init_clocks(16934400);
s3c24xx_init_uarts(at2440evb_uartcfgs, ARRAY_SIZE(at2440evb_uartcfgs));
}
---------------------- arch/arm/mach-s3c2440/mach-gta02.c ----------------------
index 5859e60..e8d2eb9 100644
@@ -508,7 +508,7 @@ static struct platform_device gta02_buttons_device = {
static void __init gta02_map_io(void)
{
+ s3c244x_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc));
s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
}
-------------------- arch/arm/mach-s3c2440/mach-mini2440.c ---------------------
index adbbb85..68adfd6 100644
@@ -535,7 +535,7 @@ static struct platform_device *mini2440_devices[] __initdata = {
static void __init mini2440_map_io(void)
{
+ s3c244x_init_io(mini2440_iodesc, ARRAY_SIZE(mini2440_iodesc));
s3c24xx_init_clocks(12000000);
s3c24xx_init_uarts(mini2440_uartcfgs, ARRAY_SIZE(mini2440_uartcfgs));
}
-------------------- arch/arm/mach-s3c2440/mach-nexcoder.c ---------------------
index 40eaf84..d714a35 100644
@@ -42,7 +42,6 @@
#include <plat/gpio-cfg.h>
#include <plat/s3c2410.h>
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h>
@@ -138,7 +137,7 @@ static void __init nexcoder_sensorboard_init(void)
static void __init nexcoder_map_io(void)
{
+ s3c244x_init_io(nexcoder_iodesc, ARRAY_SIZE(nexcoder_iodesc));
s3c24xx_init_clocks(0);
s3c24xx_init_uarts(nexcoder_uartcfgs, ARRAY_SIZE(nexcoder_uartcfgs));
--------------------- arch/arm/mach-s3c2440/mach-osiris.c ----------------------
index 4c480ef..5ae3608 100644
@@ -391,7 +391,7 @@ static void __init osiris_map_io(void)
s3c24xx_register_clocks(osiris_clocks, ARRAY_SIZE(osiris_clocks));
+ s3c244x_init_io(osiris_iodesc, ARRAY_SIZE(osiris_iodesc));
s3c24xx_init_clocks(0);
s3c24xx_init_uarts(osiris_uartcfgs, ARRAY_SIZE(osiris_uartcfgs));
--------------------- arch/arm/mach-s3c2440/mach-rx1950.c ----------------------
index f892e8b..ee452e0 100644
@@ -746,7 +746,7 @@ static void __init rx1950_map_io(void)
s3c24xx_register_clocks(rx1950_clocks, ARRAY_SIZE(rx1950_clocks));
+ s3c244x_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc));
s3c24xx_init_clocks(16934000);
s3c24xx_init_uarts(rx1950_uartcfgs, ARRAY_SIZE(rx1950_uartcfgs));
--------------------- arch/arm/mach-s3c2440/mach-rx3715.c ----------------------
index 88d648a..0ee00c2 100644
@@ -176,7 +176,7 @@ static struct platform_device *rx3715_devices[] __initdata = {
static void __init rx3715_map_io(void)
{
+ s3c244x_init_io(rx3715_iodesc, ARRAY_SIZE(rx3715_iodesc));
s3c24xx_init_clocks(16934000);
s3c24xx_init_uarts(rx3715_uartcfgs, ARRAY_SIZE(rx3715_uartcfgs));
}
-------------------- arch/arm/mach-s3c2440/mach-smdk2440.c ---------------------
index 1deb60d..c65ef15 100644
@@ -40,7 +40,6 @@
#include <plat/iic.h>
#include <plat/s3c2410.h>
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h>
@@ -161,7 +160,7 @@ static struct platform_device *smdk2440_devices[] __initdata = {
static void __init smdk2440_map_io(void)
{
+ s3c244x_init_io(smdk2440_iodesc, ARRAY_SIZE(smdk2440_iodesc));
s3c24xx_init_clocks(16934400);
s3c24xx_init_uarts(smdk2440_uartcfgs, ARRAY_SIZE(smdk2440_uartcfgs));
}
----------------------- arch/arm/mach-s3c2440/s3c2440.c ------------------------
index 01a8dc8..24b9398 100644
@@ -33,7 +33,6 @@
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/pm.h>
#include <plat/watchdog-reset.h>
@@ -41,6 +40,8 @@
#include <plat/gpio-cfg.h>
#include <plat/gpio-cfg-helpers.h>
+#include "common.h"
+
static struct sys_device s3c2440_sysdev = {
.cls = &s3c2440_sysclass,
};
----------------------- arch/arm/mach-s3c2440/s3c2442.c ------------------------
index 2c822e0..1dd136c 100644
@@ -45,13 +45,14 @@
#include <plat/clock.h>
#include <plat/cpu.h>
#include <plat/pm.h>
#include <plat/gpio-core.h>
#include <plat/gpio-cfg.h>
#include <plat/gpio-cfg-helpers.h>
+#include "common.h"
+
/* S3C2442 extended clock support */
static unsigned long s3c2442_camif_upll_round(struct clk *clk,
----------------------- arch/arm/mach-s3c2440/s3c244x.c ------------------------
index 7e8a23d..57c9683 100644
@@ -39,7 +39,6 @@
#include <mach/regs-dsc.h>
#include <plat/s3c2410.h>
#include <plat/clock.h>
#include <plat/devs.h>
#include <plat/cpu.h>
@@ -47,6 +46,8 @@
#include <plat/pll.h>
#include <plat/nand-core.h>
+#include "common.h"
+
static struct map_desc s3c244x_iodesc[] __initdata = {
IODESC_ENT(CLKPWR),
IODESC_ENT(TIMER),
------------------------- arch/arm/plat-s3c24xx/cpu.c --------------------------
index 742fa03..f91727f 100644
@@ -47,17 +47,12 @@
#include <plat/clock.h>
#include <plat/s3c2410.h>
#include <plat/s3c2412.h>
/* table of supported CPUs */
static const char name_s3c2410[] = "S3C2410";
static const char name_s3c2412[] = "S3C2412";
static const char name_s3c2410a[] = "S3C2410A";
static struct cpu_table cpu_ids[] __initdata = {
{
@@ -79,42 +74,6 @@ static struct cpu_table cpu_ids[] __initdata = {
.name = name_s3c2410a
},
{
.idcode = 0x32412001,
.idmask = 0xffffffff,
.map_io = s3c2412_map_io,
----------------- arch/arm/plat-samsung/include/plat/s3c244x.h -----------------
deleted file mode 100644
index ea0c961..0000000
@@ -1,42 +0,0 @@