diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 13:23:13 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 13:23:13 (GMT) |
| commit | 6b204283f2802a92cf91fc14c2c1b04e7295761b (patch) | |
| tree | e323818ac7f159c13f646fdf75bf0f016d7ae368 /arch/arm/mach-imx/imx53-dt.c | |
| parent | ffc505c0b99d6caf5b10d813f9a0ce3576f68996 (diff) | |
| parent | a0f5e3631b07cabf624e7d818df76d47d9d21017 (diff) | |
| download | linux-fsl-qoriq-6b204283f2802a92cf91fc14c2c1b04e7295761b.tar.xz | |
Merge branch 'imx/pinctrl' into imx/dt
Conflicts:
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/net/ethernet/freescale/fec.c
drivers/spi/spi-imx.c
drivers/tty/serial/imx.c
This resolves some simply but annoying conflicts.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx/imx53-dt.c')
| -rw-r--r-- | arch/arm/mach-imx/imx53-dt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx53-dt.c b/arch/arm/mach-imx/imx53-dt.c index 8b002fc..eb04b62 100644 --- a/arch/arm/mach-imx/imx53-dt.c +++ b/arch/arm/mach-imx/imx53-dt.c @@ -18,6 +18,7 @@ #include <linux/irqdomain.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/pinctrl/machine.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <mach/common.h> @@ -104,6 +105,8 @@ static void __init imx53_dt_init(void) of_irq_init(imx53_irq_match); + pinctrl_provide_dummies(); + node = of_find_matching_node(NULL, imx53_iomuxc_of_match); if (node) { of_id = of_match_node(imx53_iomuxc_of_match, node); |