omap2 arch: fix CONTROL_DEVCONF addresses for OMAP3430

OMAP3430 has two CONTROL_DEVCONF addresses, CONTROL_DEVCONF0 and
CONTROL_DEVCONF1; define them both.  Also, the existing address for
CONTROL_DEVCONF0 was incorrect; fix it.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
index ed4050e3cd84797b712d86547574d74ab126583e..6bc7f8a4f995f858a629ef81a1b9101e210a30f8 100644 (file)
--- a/include/asm-arm/arch-omap/omap34xx.h
+++ b/include/asm-arm/arch-omap/omap34xx.h
@@ -55,6 +55,12 @@
 
 #if defined(CONFIG_ARCH_OMAP3430)
 
+/*
+ * REVISIT: OMAP3430 has two CONTROL_DEVCONF registers, CONTROL_DEVCONF0
+ * and CONTROL_DEVCONF1.  We should probably split those defines, along
+ * with any other System Control Module registers and read/write fns,
+ * out to a separate scm.h file, and do this for 24xx also.
+ */
 #define OMAP2_32KSYNCT_BASE            OMAP3430_32KSYNCT_BASE
 #define OMAP2_CM_BASE                  OMAP3430_CM_BASE
 #define OMAP2_PRM_BASE                 OMAP3430_PRM_BASE
@@ -63,7 +69,8 @@
 #define OMAP2_L4_BASE                  L4_34XX_BASE
 #define OMAP2_VA_IC_BASE               IO_ADDRESS(OMAP34XX_IC_BASE)
 #define OMAP2_CTRL_BASE                        OMAP3430_CTRL_BASE
-#define OMAP34XX_CONTROL_DEVCONF       (L4_34XX_BASE + 0x274)
+#define OMAP34XX_CONTROL_DEVCONF0      (L4_34XX_BASE + 0x2274)
+#define OMAP34XX_CONTROL_DEVCONF1      (L4_34XX_BASE + 0x22D8)
 
 #endif