From 3f5962277e5ea5ebb99b35ab6a8fb4fecf1ba62b Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 13 Apr 2016 13:03:06 +0800 Subject: MLK-12616-10 mx6ull: Add AIPS3 initialization Since the mx6ull adds the AIPS3, so enable its initialization. Signed-off-by: Ye Li (cherry picked from commit f774a4c12b8ef197483075bbcd840b3ea27308e9) --- arch/arm/imx-common/init.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/imx-common/init.c b/arch/arm/imx-common/init.c index 15dab1d..17aa3fe 100644 --- a/arch/arm/imx-common/init.c +++ b/arch/arm/imx-common/init.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2015-2016 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -44,7 +44,8 @@ void init_aips(void) writel(0x00000000, &aips2->opacr3); writel(0x00000000, &aips2->opacr4); - if (is_cpu_type(MXC_CPU_MX6SX) || is_soc_type(MXC_SOC_MX7)) { + if (is_cpu_type(MXC_CPU_MX6ULL) || is_cpu_type(MXC_CPU_MX6SX) || + is_soc_type(MXC_SOC_MX7)) { /* * Set all MPROTx to be non-bufferable, trusted for R/W, * not forced to user-mode. -- cgit v1.1