linux-mips
[Top] [All Lists]

[PATCH][9/9][MIPS] move Cobalt reset port definition

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH][9/9][MIPS] move Cobalt reset port definition
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Fri, 14 Sep 2007 17:14:53 +0900
Cc: yoichi_yuasa@tripeaks.co.jp, linux-mips <linux-mips@linux-mips.org>
Organization: TriPeaks Corporation
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Move Cobalt reset port definition to arch/mips/cobalt/reset.c.
It's only used in arch/mips/cobalt/reset.c.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X mips/Documentation/dontdiff mips-orig/arch/mips/cobalt/reset.c 
mips/arch/mips/cobalt/reset.c
--- mips-orig/arch/mips/cobalt/reset.c  2007-09-14 17:00:18.019985750 +0900
+++ mips/arch/mips/cobalt/reset.c       2007-09-14 17:02:41.430175000 +0900
@@ -13,9 +13,11 @@
 #include <linux/kernel.h>
 #include <linux/leds.h>
 
+#include <asm/io.h>
 #include <asm/processor.h>
 
-#include <cobalt.h>
+#define COBALT_RESET_PORT      ((void __iomem *)CKSEG1ADDR(0x1c000000))
+#define COBALT_RESET           0x0f
 
 DEFINE_LED_TRIGGER(power_off_led_trigger);
 
@@ -39,7 +41,7 @@ void cobalt_machine_halt(void)
 
 void cobalt_machine_restart(char *command)
 {
-       COBALT_LED_PORT = COBALT_LED_RESET;
+       writeb(COBALT_RESET, COBALT_RESET_PORT);
 
        /* we should never get here */
        cobalt_machine_halt();
diff -pruN -X mips/Documentation/dontdiff 
mips-orig/include/asm-mips/mach-cobalt/cobalt.h 
mips/include/asm-mips/mach-cobalt/cobalt.h
--- mips-orig/include/asm-mips/mach-cobalt/cobalt.h     2007-09-14 
17:00:31.066027750 +0900
+++ mips/include/asm-mips/mach-cobalt/cobalt.h  2007-09-14 17:03:35.809573500 
+0900
@@ -1,5 +1,5 @@
 /*
- * Lowlevel hardware stuff for the MIPS based Cobalt microservers.
+ * The Cobalt board ID information.
  *
  * 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
@@ -12,9 +12,6 @@
 #ifndef __ASM_COBALT_H
 #define __ASM_COBALT_H
 
-/*
- * The Cobalt board ID information.
- */
 extern int cobalt_board_id;
 
 #define COBALT_BRD_ID_QUBE1    0x3
@@ -22,11 +19,4 @@ extern int cobalt_board_id;
 #define COBALT_BRD_ID_QUBE2    0x5
 #define COBALT_BRD_ID_RAQ2     0x6
 
-#define COBALT_LED_PORT                (*(volatile unsigned char *) 
CKSEG1ADDR(0x1c000000))
-# define COBALT_LED_BAR_LEFT   (1 << 0)        /* Qube */
-# define COBALT_LED_BAR_RIGHT  (1 << 1)        /* Qube */
-# define COBALT_LED_WEB                (1 << 2)        /* RaQ */
-# define COBALT_LED_POWER_OFF  (1 << 3)        /* RaQ */
-# define COBALT_LED_RESET      0x0f
-
 #endif /* __ASM_COBALT_H */

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH][9/9][MIPS] move Cobalt reset port definition, Yoichi Yuasa <=