aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-08-12 10:33:43 -0400
committerShawn Guo <shawn.guo@linaro.org>2012-09-11 04:26:53 -0400
commit1a60a4de8be4f8cf17f5d36c2642153b9a95184a (patch)
tree48b6fc202777a5004a562db43d77b584406f07d0 /arch/arm/mach-imx
parent072480426ba9b5a0d68d91006fdb07fd568ef6ad (diff)
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>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/Kconfig2
-rw-r--r--arch/arm/mach-imx/imx53-dt.c3
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
108 select ARCH_MX5 108 select ARCH_MX5
109 select ARCH_MX53 109 select ARCH_MX53
110 select HAVE_CAN_FLEXCAN if CAN 110 select HAVE_CAN_FLEXCAN if CAN
111 select PINCTRL
112 select PINCTRL_IMX53
111 113
112if ARCH_IMX_V4_V5 114if ARCH_IMX_V4_V5
113 115
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 @@
17#include <linux/irq.h> 17#include <linux/irq.h>
18#include <linux/of_irq.h> 18#include <linux/of_irq.h>
19#include <linux/of_platform.h> 19#include <linux/of_platform.h>
20#include <linux/pinctrl/machine.h>
21#include <asm/mach/arch.h> 20#include <asm/mach/arch.h>
22#include <asm/mach/time.h> 21#include <asm/mach/time.h>
23#include <mach/common.h> 22#include <mach/common.h>
@@ -78,8 +77,6 @@ static void __init imx53_dt_init(void)
78 const struct of_device_id *of_id; 77 const struct of_device_id *of_id;
79 void (*func)(void); 78 void (*func)(void);
80 79
81 pinctrl_provide_dummies();
82
83 node = of_find_matching_node(NULL, imx53_iomuxc_of_match); 80 node = of_find_matching_node(NULL, imx53_iomuxc_of_match);
84 if (node) { 81 if (node) {
85 of_id = of_match_node(imx53_iomuxc_of_match, node); 82 of_id = of_match_node(imx53_iomuxc_of_match, node);