summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/imx-common
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-11-19 19:02:37 -0200
committerStefano Babic <sbabic@denx.de>2015-11-25 09:41:29 +0100
commit3c8dcf0eacda531724ed83af0f54ffb4b98bc799 (patch)
tree956ec115abc3ce40c9aac5cf78b0b9725e94498a /arch/arm/include/asm/imx-common
parentd7140351c27a4ba4cd83b0cea82bf65d3a95ce18 (diff)
downloadtalos-obmc-uboot-3c8dcf0eacda531724ed83af0f54ffb4b98bc799.tar.gz
talos-obmc-uboot-3c8dcf0eacda531724ed83af0f54ffb4b98bc799.zip
iomux-v3: Take MX6D in consideration for imx_iomux_v3_setup_pad()
We should also take MX6D option in consideration when defining imx_iomux_v3_setup_pad(). Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'arch/arm/include/asm/imx-common')
-rw-r--r--arch/arm/include/asm/imx-common/iomux-v3.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h
index 1a80a962c7..2e499681cf 100644
--- a/arch/arm/include/asm/imx-common/iomux-v3.h
+++ b/arch/arm/include/asm/imx-common/iomux-v3.h
@@ -236,7 +236,7 @@ void imx_iomux_gpio_get_function(unsigned int gpio,
#if defined(CONFIG_MX6QDL)
#define IOMUX_PADS(x) (MX6Q_##x), (MX6DL_##x)
#define SETUP_IOMUX_PAD(def) \
-if (is_cpu_type(MXC_CPU_MX6Q)) { \
+if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) { \
imx_iomux_v3_setup_pad(MX6Q_##def); \
} else { \
imx_iomux_v3_setup_pad(MX6DL_##def); \
OpenPOWER on IntegriCloud