From: Peng Fan <van.freenix@gmail.com>
Date: Thu, 11 Aug 2016 06:02:44 +0000 (+0800)
Subject: imx: mx6ul: using runtime check when configuring PMIC_STBY_REQ
X-Git-Tag: v2016.11-rc2~19^2~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=00ffa56d4b0ffb1518ed9dfc313b0d3d54998879;p=oweals%2Fu-boot.git

imx: mx6ul: using runtime check when configuring PMIC_STBY_REQ

Since MX6ULL select MX6UL, we can not use IS_ENABLED(CONFIG_MX6UL) here,
because this piece code is only for i.MX6UL.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Stefano Babic <sbabic@denx.de>
---

diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index fef4eb72ee..109a15983a 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -356,7 +356,7 @@ int arch_cpu_init(void)
 			set_ahb_rate(132000000);
 	}
 
-	if (IS_ENABLED(CONFIG_MX6UL) && is_soc_rev(CHIP_REV_1_0) == 0) {
+	if (is_mx6ul() && is_soc_rev(CHIP_REV_1_0) == 0) {
 		/*
 		 * According to the design team's requirement on i.MX6UL,
 		 * the PMIC_STBY_REQ PAD should be configured as open