summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h (renamed from target/linux/ramips/files/arch/mips/ralink/rt305x/machine.h)10
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h3
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/common/setup.c17
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile2
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt288x/mach-generic.c21
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt288x/prom.c2
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c11
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile1
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/mach-generic.c21
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c4
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/prom.c11
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c13
12 files changed, 28 insertions, 88 deletions
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/machine.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
index 4ce0fdeab..267d9f3c6 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/machine.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
@@ -1,5 +1,5 @@
/*
- * Ralink RT305x SoC specific setup
+ * Ralink machine types
*
* Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
*
@@ -8,9 +8,9 @@
* by the Free Software Foundation.
*/
-enum rt305x_mach_type {
- RT305X_MACH_GENERIC,
- RT305X_MACH_WHR_G300N, /* Buffalo WHR-G300N */
+enum ramips_mach_type {
+ RAMIPS_MACH_GENERIC,
+ RAMIPS_MACH_WHR_G300N, /* Buffalo WHR-G300N */
};
-extern enum rt305x_mach_type rt305x_mach;
+extern enum ramips_mach_type ramips_mach;
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
index 85331a5ba..445bafa3d 100644
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
@@ -23,9 +23,6 @@ void rt288x_detect_sys_freq(void) __init;
extern unsigned long rt288x_cpu_freq;
extern unsigned long rt288x_sys_freq;
-extern unsigned long rt288x_mach_type;
-#define RT288X_MACH_GENERIC 0
-
#define RT288X_CPU_IRQ_BASE 0
#define RT288X_INTC_IRQ_BASE 8
#define RT288X_INTC_IRQ_COUNT 32
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/setup.c b/target/linux/ramips/files/arch/mips/ralink/common/setup.c
index 988965bc7..81a1ba4fa 100644
--- a/target/linux/ramips/files/arch/mips/ralink/common/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/setup.c
@@ -15,11 +15,14 @@
#include <asm/bootinfo.h>
#include <asm/addrspace.h>
+#include <asm/mips_machine.h>
#include <asm/mach-ralink/common.h>
+#include <asm/mach-ralink/machine.h>
#include <ralink_soc.h>
unsigned char ramips_sys_type[RAMIPS_SYS_TYPE_LEN];
+enum ramips_mach_type ramips_mach = RAMIPS_MACH_GENERIC;
const char *get_system_type(void)
{
@@ -47,3 +50,17 @@ void __init plat_mem_setup(void)
detect_mem_size();
ramips_soc_setup();
}
+
+static int __init ramips_machine_setup(void)
+{
+ mips_machine_setup(ramips_mach);
+ return 0;
+}
+
+arch_initcall(ramips_machine_setup);
+
+static void __init ramips_generic_init(void)
+{
+}
+
+MIPS_MACHINE(RAMIPS_MACH_GENERIC, "Generic Ralink board", ramips_generic_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile b/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile
index c8c9712d5..fc06fa479 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile
@@ -11,5 +11,3 @@
obj-y := prom.o irq.o setup.o rt288x.o devices.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-
-obj-$(CONFIG_RT288X_MACH_GENERIC) += mach-generic.o
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-generic.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-generic.c
deleted file mode 100644
index e4f3830a5..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-generic.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Generic RT288x machine setup
- *
- * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
- * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
- *
- * 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/init.h>
-
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mips_machine.h>
-
-static void __init rt288x_generic_init(void)
-{
-}
-
-MIPS_MACHINE(RT288X_MACH_GENERIC, "Generic RT288x board", rt288x_generic_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/prom.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/prom.c
index 80ef719e0..8becfc92e 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/prom.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/prom.c
@@ -26,8 +26,6 @@ void __init prom_init(void)
"fw_arg2=%08x, fw_arg3=%08x\n",
(unsigned int)fw_arg0, (unsigned int)fw_arg1,
(unsigned int)fw_arg2, (unsigned int)fw_arg3);
-
- rt288x_mach_type = RT288X_MACH_GENERIC;
}
void __init prom_free_prom_memory(void)
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 05184f0bd..8dc4b3c32 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c
@@ -24,8 +24,6 @@
#include <asm/mach-ralink/rt288x.h>
#include <asm/mach-ralink/rt288x_regs.h>
-unsigned long rt288x_mach_type;
-
static void rt288x_restart(char *command)
{
rt288x_sysc_wr(RT2880_RESET_SYSTEM, SYSC_REG_RESET_CTRL);
@@ -101,12 +99,3 @@ void __init plat_time_init(void)
{
mips_hpt_frequency = rt288x_cpu_freq / 2;
}
-
-static int __init rt288x_machine_setup(void)
-{
- mips_machine_setup(rt288x_mach_type);
-
- return 0;
-}
-
-arch_initcall(rt288x_machine_setup);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
index 981498e85..52231fdcc 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
@@ -11,5 +11,4 @@ obj-y := prom.o irq.o setup.o devices.o rt305x.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-obj-$(CONFIG_RT305X_MACH_GENERIC) += mach-generic.o
obj-$(CONFIG_RT305X_MACH_WHR_G300N) += mach-whr-g300n.o
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-generic.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-generic.c
deleted file mode 100644
index 3b2b70298..000000000
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-generic.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Generic RT305x machine setup
- *
- * Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
- *
- * 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/init.h>
-
-#include <asm/mips_machine.h>
-
-#include "machine.h"
-
-static void __init rt305x_generic_init(void)
-{
-}
-
-MIPS_MACHINE(RT305X_MACH_GENERIC, "Generic RT305x board", rt305x_generic_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
index a31fbea39..97fe85737 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
@@ -16,9 +16,9 @@
#include <linux/leds.h>
#include <asm/mips_machine.h>
+#include <asm/mach-ralink/machine.h>
#include <asm/mach-ralink/dev_gpio_leds.h>
-#include "machine.h"
#include "devices.h"
#define WHR_G300N_GPIO_LED_DIAG 7
@@ -93,4 +93,4 @@ static void __init whr_g300n_init(void)
whr_g300n_leds_gpio);
}
-MIPS_MACHINE(RT305X_MACH_WHR_G300N, "Buffalo WHR-G300N", whr_g300n_init);
+MIPS_MACHINE(RAMIPS_MACH_WHR_G300N, "Buffalo WHR-G300N", whr_g300n_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/prom.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/prom.c
index 8f5ddf200..774291ab7 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/prom.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/prom.c
@@ -14,14 +14,13 @@
#include <asm/bootinfo.h>
#include <asm/mach-ralink/common.h>
+#include <asm/mach-ralink/machine.h>
#include <asm/mach-ralink/rt305x.h>
#include <asm/mach-ralink/rt305x_regs.h>
-#include "machine.h"
-
struct board_rec {
char *name;
- enum rt305x_mach_type mach_type;
+ enum ramips_mach_type mach_type;
};
static int rt305x_prom_argc __initdata;
@@ -31,7 +30,7 @@ static char **rt305x_prom_envp __initdata;
static struct board_rec boards[] __initdata = {
{
.name = "WHR-G300N",
- .mach_type = RT305X_MACH_WHR_G300N,
+ .mach_type = RAMIPS_MACH_WHR_G300N,
}
};
@@ -113,11 +112,9 @@ static __init void find_board_byname(char *name)
{
int i;
- rt305x_mach = RT305X_MACH_GENERIC;
-
for (i = 0; i < ARRAY_SIZE(boards); i++)
if (strcmp(name, boards[i].name) == 0) {
- rt305x_mach = boards[i].mach_type;
+ ramips_mach = boards[i].mach_type;
break;
}
}
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 ac945b8be..50a8be873 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/setup.c
@@ -23,10 +23,6 @@
#include <asm/mach-ralink/rt305x.h>
#include <asm/mach-ralink/rt305x_regs.h>
-#include "machine.h"
-
-enum rt305x_mach_type rt305x_mach;
-
static void rt305x_restart(char *command)
{
rt305x_sysc_wr(RT305X_RESET_SYSTEM, SYSC_REG_RESET_CTRL);
@@ -103,12 +99,3 @@ void __init plat_time_init(void)
{
mips_hpt_frequency = rt305x_cpu_freq / 2;
}
-
-static int __init rt305x_machine_setup(void)
-{
- mips_machine_setup(rt305x_mach);
-
- return 0;
-}
-
-arch_initcall(rt305x_machine_setup);