patch-2.4.22 linux-2.4.22/include/asm-mips/mips-boards/generic.h

• Lines: 102
• Date: 2003-08-25 04:44:43.000000000 -0700
• Orig file: linux-2.4.21/include/asm-mips/mips-boards/generic.h
• Orig date: 2002-08-02 17:39:45.000000000 -0700

diff -urN linux-2.4.21/include/asm-mips/mips-boards/generic.h linux-2.4.22/include/asm-mips/mips-boards/generic.h
@@ -2,28 +2,23 @@
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 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.
- *
- * ########################################################################
+ * 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.
  *
  * Defines of the MIPS boards specific address-MAP, registers, etc.
- *
  */
-#ifndef _MIPS_GENERIC_H
-#define _MIPS_GENERIC_H
+#ifndef __ASM_MIPS_BOARDS_GENERIC_H
+#define __ASM_MIPS_BOARDS_GENERIC_H
 
 #include <linux/config.h>
 #include <asm/addrspace.h>
@@ -33,7 +28,7 @@
 /*
  * Display register base.
  */
-#if defined(CONFIG_MIPS_SEAD)
+#ifdef CONFIG_MIPS_SEAD
 #define ASCII_DISPLAY_POS_BASE     (KSEG1ADDR(0x1f0005c0))
 #else
 #define ASCII_DISPLAY_WORD_BASE    (KSEG1ADDR(0x1f000410))
@@ -50,7 +45,7 @@
 /*
  * Reset register.
  */
-#if defined(CONFIG_MIPS_SEAD)
+#ifdef CONFIG_MIPS_SEAD
 #define SOFTRES_REG       (KSEG1ADDR(0x1e800050))
 #define GORESET           0x4d
 #else
@@ -73,39 +68,4 @@
 
 extern unsigned int mips_revision_corid;
 
-
-/*
- * Galileo GT64120 system controller register base.
- */
-#define MIPS_GT_BASE    (KSEG1ADDR(0x1be00000))
-
-/*
- * Because of the way the internal register works on the Galileo chip,
- * we need to swap the bytes when running bigendian.
- */
-#define GT_WRITE(ofs, data)  \
-             *(volatile u32 *)(MIPS_GT_BASE+ofs) = cpu_to_le32(data)
-#define GT_READ(ofs, data)   \
-             data = le32_to_cpu(*(volatile u32 *)(MIPS_GT_BASE+ofs))
-
-#define GT_PCI_WRITE(ofs, data)  \
-	*(volatile u32 *)(MIPS_GT_BASE+ofs) = data
-#define GT_PCI_READ(ofs, data)   \
-	data = *(volatile u32 *)(MIPS_GT_BASE+ofs)
-
-/*
- * Algorithmics Bonito64 system controller register base.
- */
-static char * const _bonito = (char *)KSEG1ADDR(BONITO_REG_BASE);
-
-/*
- * MIPS System controller PCI register base.
- */
-#define MSC01_PCI_REG_BASE  (KSEG1ADDR(0x1bd00000))
-
-#define MSC_WRITE(reg, data)  \
-	*(volatile u32 *)(reg) = data
-#define MSC_READ(reg, data)   \
-	data = *(volatile u32 *)(reg)
-
-#endif  /* !(_MIPS_GENERIC_H) */
+#endif  /* __ASM_MIPS_BOARDS_GENERIC_H */