ARM: imx53: build in pinctrl support
authorShawn Guo <shawn.guo@linaro.org>
Sun, 12 Aug 2012 14:33:43 +0000 (22:33 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Tue, 11 Sep 2012 08:26:53 +0000 (16:26 +0800)
As all imx53 boards booting from device tree have pinctrl set up in dts,
it's time to remove the dummy pinctrl state and build in the real imx53
pinctrl support.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/imx53-dt.c

index e4aa082172604cd8682c410248329633e768c138..1afdc67a5f228601fb613c2932766314a7d64f97 100644 (file)
@@ -108,6 +108,8 @@ config      SOC_IMX53
        select ARCH_MX5
        select ARCH_MX53
        select HAVE_CAN_FLEXCAN if CAN
+       select PINCTRL
+       select PINCTRL_IMX53
 
 if ARCH_IMX_V4_V5
 
index d193d8f1334f4bf64a11d7c59d539c1762292547..21fcbd0e30816e9e93f1f3195369ccca843d8022 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/irq.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>
@@ -78,8 +77,6 @@ static void __init imx53_dt_init(void)
        const struct of_device_id *of_id;
        void (*func)(void);
 
-       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);