diff options
author | Steven J. Hill <Steven.Hill@imgtec.com> | 2013-06-13 15:55:06 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-21 12:07:01 -0400 |
commit | b72d9a4ef322f55f159df144bc702d9643e5a221 (patch) | |
tree | 01e7a53eda9a621b8d80e690abac884db77c825d /arch/mips/mti-malta | |
parent | 36a29af4bed7169f3332c44846576243d5abe9a5 (diff) |
MIPS: malta: Remove software reset defines from generic header.
Remove the software reset register and reset value definitions
from the 'include/asm/mips-boards/generic.h' header file. Also
clean up header and whitespace in platform file.
Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5456/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mti-malta')
-rw-r--r-- | arch/mips/mti-malta/malta-reset.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/arch/mips/mti-malta/malta-reset.c b/arch/mips/mti-malta/malta-reset.c index 791101216cc2..d627d4b2b47f 100644 --- a/arch/mips/mti-malta/malta-reset.c +++ b/arch/mips/mti-malta/malta-reset.c | |||
@@ -1,31 +1,14 @@ | |||
1 | /* | 1 | /* |
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
2 | * Carsten Langgaard, carstenl@mips.com | 6 | * Carsten Langgaard, carstenl@mips.com |
3 | * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. | 7 | * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. |
4 | * | ||
5 | * ######################################################################## | ||
6 | * | ||
7 | * This program is free software; you can distribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License (Version 2) as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
14 | * for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License along | ||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
18 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
19 | * | ||
20 | * ######################################################################## | ||
21 | * | ||
22 | * Reset the MIPS boards. | ||
23 | * | ||
24 | */ | 8 | */ |
25 | #include <linux/init.h> | 9 | #include <linux/io.h> |
26 | #include <linux/pm.h> | 10 | #include <linux/pm.h> |
27 | 11 | ||
28 | #include <asm/io.h> | ||
29 | #include <asm/reboot.h> | 12 | #include <asm/reboot.h> |
30 | 13 | ||
31 | #define SOFTRES_REG 0x1f000500 | 14 | #define SOFTRES_REG 0x1f000500 |
@@ -47,7 +30,6 @@ static void mips_machine_halt(void) | |||
47 | __raw_writel(GORESET, softres_reg); | 30 | __raw_writel(GORESET, softres_reg); |
48 | } | 31 | } |
49 | 32 | ||
50 | |||
51 | static int __init mips_reboot_setup(void) | 33 | static int __init mips_reboot_setup(void) |
52 | { | 34 | { |
53 | _machine_restart = mips_machine_restart; | 35 | _machine_restart = mips_machine_restart; |
@@ -56,5 +38,4 @@ static int __init mips_reboot_setup(void) | |||
56 | 38 | ||
57 | return 0; | 39 | return 0; |
58 | } | 40 | } |
59 | |||
60 | arch_initcall(mips_reboot_setup); | 41 | arch_initcall(mips_reboot_setup); |