summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-08-10 12:55:18 +0200
committerStefan Agner <stefan.agner@toradex.com>2017-08-31 19:57:39 -0700
commit756bc8ff5eb008a0ea5bee1363cd260b775db86a (patch)
treeaf461cee13fa6773a4a80e54223fdc46a1a14a17 /arch
parentab546abe4b2252ae84eee662c01594fa1d306c2c (diff)
imx6ull: cherry-pick remaining stuff from 05922b0
Not all of the following commit from the nxp vendor tree made it into 2016.11. http://git.freescale.com/git/cgit.cgi/imx/uboot-imx.git/commit/?h=imx_v2016.03_4.1.15_2.0.0_ga&id=05922b0abf848949df778c19312cb1cf7fdfbe6a commit 05922b0abf848949df778c19312cb1cf7fdfbe6a Author: Peng Fan <peng.fan@nxp.com> Date: Mon May 9 17:31:34 2016 +0800 MLK-12767 imx6ull: fix runtime checking for i.MX6ULL Fix runtime checking for i.MX6ULL. Add is_cpu_type(MXC_CPU_MX6ULL) to avoid using wrong code path. Signed-off-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/imx-common/init.c2
-rw-r--r--arch/arm/include/asm/arch-mx6/crm_regs.h6
-rw-r--r--arch/arm/include/asm/arch-mx6/imx-regs.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/imx-common/init.c b/arch/arm/imx-common/init.c
index e5dbd93c3b8..afb69677b20 100644
--- a/arch/arm/imx-common/init.c
+++ b/arch/arm/imx-common/init.c
@@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable)
writew(enable, &wdog1->wmcr);
writew(enable, &wdog2->wmcr);
- if (is_mx6sx() || is_mx6ul() || is_mx7())
+ if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7())
writew(enable, &wdog3->wmcr);
#ifdef CONFIG_MX7D
writew(enable, &wdog4->wmcr);
diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h
index f74737a68e6..e06a72d70d6 100644
--- a/arch/arm/include/asm/arch-mx6/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx6/crm_regs.h
@@ -429,15 +429,15 @@ struct mxc_ccm_reg {
#define MXC_CCM_CS2CDR_ENFC_CLK_SEL_DQ(v) (((v) & 0x3) << 16)
#define MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK \
- ((is_mx6dqp() || is_cpu_type(MXC_CPU_MX6UL)) ? \
+ ((is_mx6dqp() || is_mx6ul() || is_mx6ull()) ? \
MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK_DQP : \
MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK_DQ)
#define MXC_CCM_CS2CDR_ENFC_CLK_SEL_OFFSET \
- ((is_mx6dqp() || is_cpu_type(MXC_CPU_MX6UL)) ? \
+ ((is_mx6dqp() || is_mx6ul() || is_mx6ull()) ? \
MXC_CCM_CS2CDR_ENFC_CLK_SEL_OFFSET_DQP : \
MXC_CCM_CS2CDR_ENFC_CLK_SEL_OFFSET_DQ)
#define MXC_CCM_CS2CDR_ENFC_CLK_SEL(v) \
- ((is_mx6dqp() || is_cpu_type(MXC_CPU_MX6UL)) ? \
+ ((is_mx6dqp() || is_mx6ul() || is_mx6ull()) ? \
MXC_CCM_CS2CDR_ENFC_CLK_SEL_DQP(v) : \
MXC_CCM_CS2CDR_ENFC_CLK_SEL_DQ(v))
diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h
index 1bd007c8f31..4ed5df7e394 100644
--- a/arch/arm/include/asm/arch-mx6/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx6/imx-regs.h
@@ -346,8 +346,8 @@
#include <asm/types.h>
/* only for i.MX6SX/UL */
-#define WDOG3_BASE_ADDR ((is_mx6ul() ? \
- MX6UL_WDOG3_BASE_ADDR : MX6SX_WDOG3_BASE_ADDR))
+#define WDOG3_BASE_ADDR ((is_mx6ul() || is_mx6ull()) ? \
+ MX6UL_WDOG3_BASE_ADDR : MX6SX_WDOG3_BASE_ADDR)
#define LCDIF1_BASE_ADDR ((is_mx6ul()) ? \
MX6UL_LCDIF1_BASE_ADDR : \
((is_mx6ull()) ? \