diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-08-12 22:33:43 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-11 16:26:53 +0800 |
| commit | 1a60a4de8be4f8cf17f5d36c2642153b9a95184a (patch) | |
| tree | 48b6fc202777a5004a562db43d77b584406f07d0 | |
| parent | 072480426ba9b5a0d68d91006fdb07fd568ef6ad (diff) | |
| download | talos-op-linux-1a60a4de8be4f8cf17f5d36c2642153b9a95184a.tar.gz talos-op-linux-1a60a4de8be4f8cf17f5d36c2642153b9a95184a.zip | |
ARM: imx53: build in pinctrl support
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>
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx53-dt.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index e4aa08217260..1afdc67a5f22 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -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 diff --git a/arch/arm/mach-imx/imx53-dt.c b/arch/arm/mach-imx/imx53-dt.c index d193d8f1334f..21fcbd0e3081 100644 --- a/arch/arm/mach-imx/imx53-dt.c +++ b/arch/arm/mach-imx/imx53-dt.c @@ -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); |
