From: Filip Brozovic <fbrozovic@gmail.com>
Date: Wed, 14 Sep 2016 11:50:39 +0000 (+0200)
Subject: imx: iomux-v3: fix pad setup on i.MX6DQP when CONFIG_MX6QDL is defined
X-Git-Tag: v2016.11-rc2~19^2~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=514a0f4b680bf93dc8fe0e7d3e9097dfee1625b6;p=platform%2Fkernel%2Fu-boot.git

imx: iomux-v3: fix pad setup on i.MX6DQP when CONFIG_MX6QDL is defined

The CPU detection macro is_mx6dq returns 0 on an i.MX6DQP, so we need to
check for it explicitly in order to correctly initialize the pads when
CONFIG_MX6QDL is defined.

Signed-off-by: Filip Brozovic <fbrozovic@gmail.com>
---

diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
index 66137d1..2612e09 100644
--- a/arch/arm/imx-common/iomux-v3.c
+++ b/arch/arm/imx-common/iomux-v3.c
@@ -83,7 +83,7 @@ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
 
 #if defined(CONFIG_MX6QDL)
 	stride = 2;
-	if (!is_mx6dq())
+	if (!is_mx6dq() && !is_mx6dqp())
 		p += 1;
 #else
 	stride = 1;