summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-02-17 10:51:41 +0800
committerPeng Fan <peng.fan@nxp.com>2016-04-12 14:07:08 +0800
commitf774a4c12b8ef197483075bbcd840b3ea27308e9 (patch)
tree30b84fb198f914ef6674df3b06ae5a35af054b95
parent5154e0c15965019602a7c128abe00d58b6e26ff1 (diff)
downloadu-boot-imx-f774a4c12b8ef197483075bbcd840b3ea27308e9.zip
u-boot-imx-f774a4c12b8ef197483075bbcd840b3ea27308e9.tar.gz
u-boot-imx-f774a4c12b8ef197483075bbcd840b3ea27308e9.tar.bz2
MLK-12616-10 mx6ull: Add AIPS3 initialization
Since the mx6ull adds the AIPS3, so enable its initialization. Signed-off-by: Ye Li <ye.li@nxp.com>
-rw-r--r--arch/arm/cpu/armv7/mx6/soc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index 71001fb..71d3fc4 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -110,13 +110,13 @@ u32 __weak get_board_rev(void)
void init_aips(void)
{
struct aipstz_regs *aips1, *aips2;
-#ifdef CONFIG_MX6SX
+#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6ULL)
struct aipstz_regs *aips3;
#endif
aips1 = (struct aipstz_regs *)AIPS1_BASE_ADDR;
aips2 = (struct aipstz_regs *)AIPS2_BASE_ADDR;
-#ifdef CONFIG_MX6SX
+#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6ULL)
aips3 = (struct aipstz_regs *)AIPS3_CONFIG_BASE_ADDR;
#endif
@@ -145,7 +145,7 @@ void init_aips(void)
writel(0x00000000, &aips2->opacr3);
writel(0x00000000, &aips2->opacr4);
-#ifdef CONFIG_MX6SX
+#if defined(CONFIG_MX6SX) || defined(CONFIG_MX6ULL)
/*
* Set all MPROTx to be non-bufferable, trusted for R/W,
* not forced to user-mode.