Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/mips/include/asm/mips-boards/generic.h

+0 −6
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ 
#define ASCII_DISPLAY_WORD_BASE	   0x1f000410

#define ASCII_DISPLAY_POS_BASE	   0x1f000418



/*

 * Reset register.

 */

#define SOFTRES_REG	  0x1f000500

#define GORESET		  0x42



/*

 * Revision register.

 */

arch/mips/mti-malta/malta-reset.c

+5 −24
Original line number Diff line number Diff line 
/*

 * Carsten Langgaard, carstenl@mips.com

 * 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

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

 *

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

 *

 * Carsten Langgaard, carstenl@mips.com

 * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.

 */

#include <linux/init.h>

#include <linux/io.h>

#include <linux/pm.h>



#include <asm/io.h>

#include <asm/reboot.h>



#define SOFTRES_REG	0x1f000500
@@ -47,7 +30,6 @@ static void mips_machine_halt(void) 
	__raw_writel(GORESET, softres_reg);

}





static int __init mips_reboot_setup(void)

{

	_machine_restart = mips_machine_restart;
@@ -56,5 +38,4 @@ static int __init mips_reboot_setup(void) 


	return 0;

}



arch_initcall(mips_reboot_setup);