summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-08-13 19:55:37 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-09-11 16:26:58 +0800
commitb6798f88bc1458eb7ab671b874880fd7ba77cfb4 (patch)
tree37a4d2b8d980dd6d86d8bb577d249d209a082296
parentb72cf10578651411143b0ef21bfe0b6ffc921aa2 (diff)
downloadop-kernel-dev-b6798f88bc1458eb7ab671b874880fd7ba77cfb4.zip
op-kernel-dev-b6798f88bc1458eb7ab671b874880fd7ba77cfb4.tar.gz
ARM: imx51: build in pinctrl support
With the imx51 DT board having pinctrl setup define in device tree, it's time to remove dummy pinctrl state and build in the real imx51 pinctrl support. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/mach-imx/Kconfig2
-rw-r--r--arch/arm/mach-imx/imx51-dt.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 374fcc2..7ca5fe4 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -101,6 +101,8 @@ config SOC_IMX51
select SOC_IMX5
select ARCH_MX5
select ARCH_MX51
+ select PINCTRL
+ select PINCTRL_IMX51
if ARCH_IMX_V4_V5
diff --git a/arch/arm/mach-imx/imx51-dt.c b/arch/arm/mach-imx/imx51-dt.c
index 8604165..306cddc 100644
--- a/arch/arm/mach-imx/imx51-dt.c
+++ b/arch/arm/mach-imx/imx51-dt.c
@@ -13,7 +13,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>
@@ -55,8 +54,6 @@ static void __init imx51_dt_init(void)
const struct of_device_id *of_id;
void (*func)(void);
- pinctrl_provide_dummies();
-
node = of_find_matching_node(NULL, imx51_iomuxc_of_match);
if (node) {
of_id = of_match_node(imx51_iomuxc_of_match, node);
OpenPOWER on IntegriCloud