aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/mips-boards/generic
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2008-07-15 13:44:33 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-07-15 13:44:33 -0400
commit2157bc68711bf0e69f9aca4d310bd863298fbb3f (patch)
tree782eccb964694e9ffc534f6d970cd8a2bd25ffa0 /arch/mips/mips-boards/generic
parent372a775f50347f5c1dd87752b16e5c05ea965790 (diff)
[MIPS] Atlas: Remove support code.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards/generic')
-rw-r--r--arch/mips/mips-boards/generic/console.c11
-rw-r--r--arch/mips/mips-boards/generic/init.c8
-rw-r--r--arch/mips/mips-boards/generic/reset.c17
-rw-r--r--arch/mips/mips-boards/generic/time.c5
4 files changed, 2 insertions, 39 deletions
diff --git a/arch/mips/mips-boards/generic/console.c b/arch/mips/mips-boards/generic/console.c
index 4d8ab99e4155..4a2aecc6da1b 100644
--- a/arch/mips/mips-boards/generic/console.c
+++ b/arch/mips/mips-boards/generic/console.c
@@ -22,16 +22,7 @@
22#include <linux/serial_reg.h> 22#include <linux/serial_reg.h>
23#include <asm/io.h> 23#include <asm/io.h>
24 24
25#ifdef CONFIG_MIPS_ATLAS 25#if defined(CONFIG_MIPS_SEAD)
26#include <asm/mips-boards/atlas.h>
27
28#ifdef CONFIG_CPU_LITTLE_ENDIAN
29#define PORT(offset) (ATLAS_UART_REGS_BASE + ((offset)<<3))
30#else
31#define PORT(offset) (ATLAS_UART_REGS_BASE + 3 + ((offset)<<3))
32#endif
33
34#elif defined(CONFIG_MIPS_SEAD)
35 26
36#include <asm/mips-boards/sead.h> 27#include <asm/mips-boards/sead.h>
37 28
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c
index 83b9dc739203..bac23b5fbf3f 100644
--- a/arch/mips/mips-boards/generic/init.c
+++ b/arch/mips/mips-boards/generic/init.c
@@ -197,14 +197,6 @@ void __init kgdb_config(void)
197 while ((c = *++argptr) && ('0' <= c && c <= '9')) 197 while ((c = *++argptr) && ('0' <= c && c <= '9'))
198 speed = speed * 10 + c - '0'; 198 speed = speed * 10 + c - '0';
199 } 199 }
200#ifdef CONFIG_MIPS_ATLAS
201 if (line == 1) {
202 speed = saa9730_kgdb_hook(speed);
203 generic_putDebugChar = saa9730_putDebugChar;
204 generic_getDebugChar = saa9730_getDebugChar;
205 }
206 else
207#endif
208 { 200 {
209 speed = rs_kgdb_hook(line, speed); 201 speed = rs_kgdb_hook(line, speed);
210 generic_putDebugChar = rs_putDebugChar; 202 generic_putDebugChar = rs_putDebugChar;
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c
index 583d468d98a9..5f73ff6180eb 100644
--- a/arch/mips/mips-boards/generic/reset.c
+++ b/arch/mips/mips-boards/generic/reset.c
@@ -27,15 +27,9 @@
27#include <asm/io.h> 27#include <asm/io.h>
28#include <asm/reboot.h> 28#include <asm/reboot.h>
29#include <asm/mips-boards/generic.h> 29#include <asm/mips-boards/generic.h>
30#if defined(CONFIG_MIPS_ATLAS)
31#include <asm/mips-boards/atlas.h>
32#endif
33 30
34static void mips_machine_restart(char *command); 31static void mips_machine_restart(char *command);
35static void mips_machine_halt(void); 32static void mips_machine_halt(void);
36#if defined(CONFIG_MIPS_ATLAS)
37static void atlas_machine_power_off(void);
38#endif
39 33
40static void mips_machine_restart(char *command) 34static void mips_machine_restart(char *command)
41{ 35{
@@ -53,22 +47,11 @@ static void mips_machine_halt(void)
53 __raw_writel(GORESET, softres_reg); 47 __raw_writel(GORESET, softres_reg);
54} 48}
55 49
56#if defined(CONFIG_MIPS_ATLAS)
57static void atlas_machine_power_off(void)
58{
59 unsigned int __iomem *psustby_reg = ioremap(ATLAS_PSUSTBY_REG, sizeof(unsigned int));
60
61 writew(ATLAS_GOSTBY, psustby_reg);
62}
63#endif
64 50
65void mips_reboot_setup(void) 51void mips_reboot_setup(void)
66{ 52{
67 _machine_restart = mips_machine_restart; 53 _machine_restart = mips_machine_restart;
68 _machine_halt = mips_machine_halt; 54 _machine_halt = mips_machine_halt;
69#if defined(CONFIG_MIPS_ATLAS)
70 pm_power_off = atlas_machine_power_off;
71#endif
72#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_SEAD) 55#if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_SEAD)
73 pm_power_off = mips_machine_halt; 56 pm_power_off = mips_machine_halt;
74#endif 57#endif
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index fe2cac1b4514..d224267846b0 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -42,9 +42,6 @@
42#include <asm/mips-boards/generic.h> 42#include <asm/mips-boards/generic.h>
43#include <asm/mips-boards/prom.h> 43#include <asm/mips-boards/prom.h>
44 44
45#ifdef CONFIG_MIPS_ATLAS
46#include <asm/mips-boards/atlasint.h>
47#endif
48#ifdef CONFIG_MIPS_MALTA 45#ifdef CONFIG_MIPS_MALTA
49#include <asm/mips-boards/maltaint.h> 46#include <asm/mips-boards/maltaint.h>
50#endif 47#endif
@@ -89,7 +86,7 @@ static unsigned int __init estimate_cpu_frequency(void)
89 else 86 else
90 count = 6000000; 87 count = 6000000;
91#endif 88#endif
92#if defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_MALTA) 89#ifdef CONFIG_MIPS_MALTA
93 unsigned long flags; 90 unsigned long flags;
94 unsigned int start; 91 unsigned int start;
95 92