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/mach-imx6q.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/mach-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index da6c1d9af768..3df360a52c17 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -19,6 +19,7 @@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/pinctrl/machine.h> #include <linux/phy.h> #include <linux/micrel_phy.h> #include <asm/smp_twd.h> @@ -77,6 +78,12 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev) static void __init imx6q_init_machine(void) { + /* + * This should be removed when all imx6q boards have pinctrl + * states for devices defined in device tree. + */ + pinctrl_provide_dummies(); + if (of_machine_is_compatible("fsl,imx6q-sabrelite")) phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK, ksz9021rn_phy_fixup); |