mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Steven J. Hill 2013-06-13 19:55:06 +00:00 committed by Ralf Baechle
parent 36a29af4be
commit b72d9a4ef3
2 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/include/asm/mips-boards/generic.h
View File

@ -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.
*/ */

29
arch/mips/mti-malta/malta-reset.c
View File

@ -1,31 +1,14 @@
/* /*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Carsten Langgaard, carstenl@mips.com * Carsten Langgaard, carstenl@mips.com
* Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
*
* ########################################################################
*
* 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.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 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)
__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)
return 0; return 0;
} }
arch_initcall(mips_reboot_setup); arch_initcall(mips_reboot_setup);