diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-08-11 10:33:48 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-09-11 04:26:49 -0400 |
commit | d9d253a498a60043b5f63ff7b4060ef6553f24d9 (patch) | |
tree | 774bc0689e24bca73d8352cb49c07908ad46597e /arch | |
parent | 497ae1747b8c52fde4ab7e9987326ca43886b652 (diff) |
ARM: imx6q: remove dummy pinctrl state
As all imx6q boards have pinctrl set up in device tree, it's time to
remove the dummy pinctrl state.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 7a9599fcbf82..263bc9148183 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/of_address.h> | 22 | #include <linux/of_address.h> |
23 | #include <linux/of_irq.h> | 23 | #include <linux/of_irq.h> |
24 | #include <linux/of_platform.h> | 24 | #include <linux/of_platform.h> |
25 | #include <linux/pinctrl/machine.h> | ||
26 | #include <linux/phy.h> | 25 | #include <linux/phy.h> |
27 | #include <linux/micrel_phy.h> | 26 | #include <linux/micrel_phy.h> |
28 | #include <linux/mfd/anatop.h> | 27 | #include <linux/mfd/anatop.h> |
@@ -159,12 +158,6 @@ static void __init imx6q_usb_init(void) | |||
159 | 158 | ||
160 | static void __init imx6q_init_machine(void) | 159 | static void __init imx6q_init_machine(void) |
161 | { | 160 | { |
162 | /* | ||
163 | * This should be removed when all imx6q boards have pinctrl | ||
164 | * states for devices defined in device tree. | ||
165 | */ | ||
166 | pinctrl_provide_dummies(); | ||
167 | |||
168 | if (of_machine_is_compatible("fsl,imx6q-sabrelite")) | 161 | if (of_machine_is_compatible("fsl,imx6q-sabrelite")) |
169 | imx6q_sabrelite_init(); | 162 | imx6q_sabrelite_init(); |
170 | 163 | ||