diff options
| author | Dong Aisheng <dong.aisheng@linaro.org> | 2012-05-02 13:31:20 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-08 17:05:16 +0200 |
| commit | a2aa65a332b46c4e95f1226b567ff5e68bdfceac (patch) | |
| tree | e08f108d9cb6a5bd4d25a4077ff4ee49dfcfe8cc /arch/arm/mach-imx/mm-imx25.c | |
| parent | Linux 3.4-rc5 (diff) | |
| download | linux-a2aa65a332b46c4e95f1226b567ff5e68bdfceac.tar.xz linux-a2aa65a332b46c4e95f1226b567ff5e68bdfceac.zip | |
ARM: imx: enable pinctrl dummy states
Enable pinctrl dummy states for imx platforms without pinctrl
support.
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx25.c')
| -rw-r--r-- | arch/arm/mach-imx/mm-imx25.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx25.c b/arch/arm/mach-imx/mm-imx25.c index 153b457acdc0..6ff37140a4f8 100644 --- a/arch/arm/mach-imx/mm-imx25.c +++ b/arch/arm/mach-imx/mm-imx25.c @@ -19,6 +19,7 @@ #include <linux/mm.h> #include <linux/init.h> #include <linux/err.h> +#include <linux/pinctrl/machine.h> #include <asm/pgtable.h> #include <asm/mach/map.h> @@ -95,6 +96,7 @@ void __init imx25_soc_init(void) mxc_register_gpio("imx31-gpio", 2, MX25_GPIO3_BASE_ADDR, SZ_16K, MX25_INT_GPIO3, 0); mxc_register_gpio("imx31-gpio", 3, MX25_GPIO4_BASE_ADDR, SZ_16K, MX25_INT_GPIO4, 0); + pinctrl_provide_dummies(); /* i.mx25 has the i.mx35 type sdma */ imx_add_imx_sdma("imx35-sdma", MX25_SDMA_BASE_ADDR, MX25_INT_SDMA, &imx25_sdma_pdata); /* i.mx25 has the i.mx31 type audmux */ |