Commit b72d9a4e authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle

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: default avatarSteven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5456/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 36a29af4
...@@ -23,12 +23,6 @@ ...@@ -23,12 +23,6 @@
#define ASCII_DISPLAY_WORD_BASE 0x1f000410 #define ASCII_DISPLAY_WORD_BASE 0x1f000410
#define ASCII_DISPLAY_POS_BASE 0x1f000418 #define ASCII_DISPLAY_POS_BASE 0x1f000418
/*
* Reset register.
*/
#define SOFTRES_REG 0x1f000500
#define GORESET 0x42
/* /*
* Revision register. * Revision register.
*/ */
......
/* /*
* Carsten Langgaard, carstenl@mips.com * This file is subject to the terms and conditions of the GNU General Public
* Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. * License. See the file "COPYING" in the main directory of this archive
*
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it
* under the terms of the GNU General Public License (Version 2) as
* published by the Free Software Foundation.
*
* This program is distributed in the hope 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. * for more details.
* *
* You should have received a copy of the GNU General Public License along * Carsten Langgaard, carstenl@mips.com
* with this program; if not, write to the Free Software Foundation, Inc., * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
*
* ########################################################################
*
* Reset the MIPS boards.
*
*/ */
#include <linux/init.h> #include <linux/io.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/io.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#define SOFTRES_REG 0x1f000500 #define SOFTRES_REG 0x1f000500
...@@ -47,7 +30,6 @@ static void mips_machine_halt(void) ...@@ -47,7 +30,6 @@ static void mips_machine_halt(void)
__raw_writel(GORESET, softres_reg); __raw_writel(GORESET, softres_reg);
} }
static int __init mips_reboot_setup(void) static int __init mips_reboot_setup(void)
{ {
_machine_restart = mips_machine_restart; _machine_restart = mips_machine_restart;
...@@ -56,5 +38,4 @@ static int __init mips_reboot_setup(void) ...@@ -56,5 +38,4 @@ static int __init mips_reboot_setup(void)
return 0; return 0;
} }
arch_initcall(mips_reboot_setup); arch_initcall(mips_reboot_setup);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment