From: Paul Walmsley Date: Thu, 27 Sep 2007 06:11:20 +0000 (-0600) Subject: omap2 arch: fix CONTROL_DEVCONF addresses for OMAP3430 X-Git-Tag: v2.6.23-omap1~58 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e34c5653e717791f750f8bf05b16d2e6add0414a;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Tony Lindgren --- diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h index ed4050e3cd8..6bc7f8a4f99 100644 --- 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