[ARM] 5531/1: Freescale STMP: get rid of HW_zzz macros [2/3]

[safe/jmp/linux-2.6] / arch / arm / mach-stmp37xx / include / mach / regs-icoll.h

diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-icoll.h b/arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
index 8a92f92..3b7c922 100644 (file)
--- a/arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
+++ b/arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
@@ -1,36 +1,43 @@
 /*
- * Freescale STMP378X: clock registers definitions
+ * stmp37xx: ICOLL register definitions
  *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (c) 2008 Freescale Semiconductor
  * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
  *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that 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
  */
+#ifndef _MACH_REGS_ICOLL
+#define _MACH_REGS_ICOLL
+
+#define REGS_ICOLL_BASE        (STMP3XXX_REGS_BASE + 0x0)
 
-#ifndef _INCLUDE_ASM_ARCH_REGS_ICOLL_H
-#define _INCLUDE_ASM_ARCH_REGS_ICOLL_H
+#define HW_ICOLL_VECTOR                0x0
 
+#define HW_ICOLL_LEVELACK      0x10
 
-#include <mach/stmp3xxx_regs.h>
+#define HW_ICOLL_CTRL          0x20
+#define BM_ICOLL_CTRL_CLKGATE  0x40000000
+#define BM_ICOLL_CTRL_SFTRST   0x80000000
 
-#define REGS_ICOLL_BASE (REGS_BASE + 0x00000000)
+#define HW_ICOLL_STAT          0x30
 
-HW_REGISTER(HW_ICOLL_VECTOR, REGS_ICOLL_BASE, 0x00)
-HW_REGISTER_WO(HW_ICOLL_LEVELACK, REGS_ICOLL_BASE, 0x10)
-HW_REGISTER(HW_ICOLL_CTRL, REGS_ICOLL_BASE, 0x20)
-#define BM_ICOLL_CTRL_CLKGATE    0x40000000
-#define BM_ICOLL_CTRL_SFTRST      0x80000000
-HW_REGISTER_RO(HW_ICOLL_STAT, REGS_ICOLL_BASE, 0x30)
+#define HW_ICOLL_PRIORITY0     (0x60 + 0 * 0x10)
+#define HW_ICOLL_PRIORITY1     (0x60 + 1 * 0x10)
+#define HW_ICOLL_PRIORITY2     (0x60 + 2 * 0x10)
+#define HW_ICOLL_PRIORITY3     (0x60 + 3 * 0x10)
 
-HW_REGISTER_INDEXED(HW_ICOLL_PRIORITYn, REGS_ICOLL_BASE, 0x60, 0x10)
+#define HW_ICOLL_PRIORITYn     0x60
 
-#endif /* _INCLUDE_ASM_ARCH_REGS_CLKCTRL_H */
+#endif