ARM: OMAP: Correct use of CONTROL_ regs for OMAP2

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / omap24xx.h

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 19b93efae933b0b8d0dc5e1deadd27a5bdd0781d..2e944a159ec1abdb92b2f7b941fc038ddac23ed1 100644 (file)
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -1,3 +1,28 @@
+/*
+ * include/asm-arm/arch-omap/omap24xx.h
+ *
+ * This file contains the processor specific definitions
+ * of the TI OMAP24XX.
+ *
+ * Copyright (C) 2007 Texas Instruments.
+ * Copyright (C) 2007 Nokia Corporation.
+ *
+ * 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 __ASM_ARCH_OMAP24XX_H
 #define __ASM_ARCH_OMAP24XX_H
 
@@ -16,8 +41,6 @@
 #define OMAP24XX_IVA_INTC_BASE 0x40000000
 #define IRQ_SIR_IRQ            0x0040
 
-#define OMAP24XX_CONTROL_STATUS        (L4_24XX_BASE + 0x2f8)
-
 #define OMAP2420_CTRL_BASE     L4_24XX_BASE
 #define OMAP2420_32KSYNCT_BASE (L4_24XX_BASE + 0x4000)
 #define OMAP2420_PRCM_BASE     (L4_24XX_BASE + 0x8000)
@@ -51,6 +74,9 @@
 /* Mailbox */
 #define OMAP24XX_MAILBOX_BASE  (L4_24XX_BASE + 0x94000)
 
+/* Camera */
+#define OMAP24XX_CAMERA_BASE   (L4_24XX_BASE + 0x52000)
+
 #if defined(CONFIG_ARCH_OMAP2420)
 
 #define OMAP2_32KSYNCT_BASE    OMAP2420_32KSYNCT_BASE
@@ -77,5 +103,12 @@
 
 #endif
 
+/* Control module */
+#define OMAP2_CONTROL_DEVCONF0 (OMAP2_CTRL_BASE + 0x274)
+#define OMAP2_CONTROL_DEVCONF1 (OMAP2_CTRL_BASE + 0x2e8)
+#define OMAP2_CONTROL_DEVCONF   OMAP2_CONTROL_DEVCONF0
+
+#define OMAP2_CONTROL_STATUS   (OMAP2_CTRL_BASE + 0x2f8)
+
 #endif /* __ASM_ARCH_OMAP24XX_H */