From 3cc0bc90387d7cea119bee68a6f9c08295267c8c Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 31 Aug 2009 18:53:22 +0000 Subject: [PATCH] add common setup code SVN-Revision: 17453 --- .../mips/include/asm/mach-ralink/common.h | 2 ++ .../files/arch/mips/ralink/common/Makefile | 2 +- .../files/arch/mips/ralink/common/setup.c | 24 +++++++++++++++++++ .../files/arch/mips/ralink/rt288x/setup.c | 5 ++-- .../files/arch/mips/ralink/rt305x/setup.c | 5 ++-- 5 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 target/linux/ramips/files/arch/mips/ralink/common/setup.c diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h index a04508758e..240951bb1b 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/common.h @@ -13,4 +13,6 @@ void __init ramips_intc_irq_init(unsigned intc_base, unsigned irq, unsigned irq_base); u32 ramips_intc_get_status(void); +void __init ramips_soc_setup(void); + #endif /* __ASM_MACH_RALINK_COMMON_H */ diff --git a/target/linux/ramips/files/arch/mips/ralink/common/Makefile b/target/linux/ramips/files/arch/mips/ralink/common/Makefile index 24f67ea6c3..96f348a5a1 100644 --- a/target/linux/ramips/files/arch/mips/ralink/common/Makefile +++ b/target/linux/ramips/files/arch/mips/ralink/common/Makefile @@ -7,6 +7,6 @@ # under the terms of the GNU General Public License version 2 as published # by the Free Software Foundation. -obj-y := intc.o gpio.o +obj-y := setup.o intc.o gpio.o obj-$(CONFIG_RALINK_DEV_GPIO_LEDS) += dev-gpio-leds.o diff --git a/target/linux/ramips/files/arch/mips/ralink/common/setup.c b/target/linux/ramips/files/arch/mips/ralink/common/setup.c new file mode 100644 index 0000000000..6440ccb01a --- /dev/null +++ b/target/linux/ramips/files/arch/mips/ralink/common/setup.c @@ -0,0 +1,24 @@ +/* + * Ralink SoC common setup + * + * Copyright (C) 2008-2009 Gabor Juhos + * Copyright (C) 2008 Imre Kaloz + * + * 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 +#include +#include + +#include +#include + +void __init plat_mem_setup(void) +{ + set_io_port_base(KSEG1); + + ramips_soc_setup(); +} diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c index d0258524cc..fe94126e5d 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -100,10 +101,8 @@ unsigned int __cpuinit get_c0_compare_irq(void) return CP0_LEGACY_COMPARE_IRQ; } -void __init plat_mem_setup(void) +void __init ramips_soc_setup(void) { - set_io_port_base(KSEG1); - rt288x_sysc_base = ioremap_nocache(RT2880_SYSC_BASE, RT2880_SYSC_SIZE); rt288x_memc_base = ioremap_nocache(RT2880_MEMC_BASE, RT2880_MEMC_SIZE); diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c index d574ef650e..70eaae4254 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -99,10 +100,8 @@ unsigned int __cpuinit get_c0_compare_irq(void) return CP0_LEGACY_COMPARE_IRQ; } -void __init plat_mem_setup(void) +void __init ramips_soc_setup(void) { - set_io_port_base(KSEG1); - rt305x_sysc_base = ioremap_nocache(RT305X_SYSC_BASE, PAGE_SIZE); rt305x_memc_base = ioremap_nocache(RT305X_MEMC_BASE, PAGE_SIZE);