From: Otavio Salvador Date: Thu, 19 Nov 2015 21:02:37 +0000 (-0200) Subject: iomux-v3: Take MX6D in consideration for imx_iomux_v3_setup_pad() X-Git-Tag: v2016.01-rc2~42^2~7 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c8dcf0eacda531724ed83af0f54ffb4b98bc799;p=oweals%2Fu-boot.git 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 Reviewed-by: Fabio Estevam --- 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); \