diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-04 08:21:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-04 08:21:28 -0500 |
| commit | a85670e40da1ef4f299effb73c36e48d39d50106 (patch) | |
| tree | 19886e80adb2c9e201387b74a042953e0070bb10 /arch/arm/include | |
| parent | f5bcfe151e61558572b9f9036c67d51bd831a436 (diff) | |
| parent | a80a999c9b5c128cad2f67b4b32036bd4d667904 (diff) | |
| download | u-boot-imx-a85670e40da1ef4f299effb73c36e48d39d50106.zip u-boot-imx-a85670e40da1ef4f299effb73c36e48d39d50106.tar.gz u-boot-imx-a85670e40da1ef4f299effb73c36e48d39d50106.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/imx-common/iomux-v3.h | 2 |
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 1a80a96..2e49968 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); \ |