diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 045b3f6a387..754f1ee34d8 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 | ||
@@ -218,9 +211,6 @@ static struct sys_timer imx6q_timer = { | |||
218 | }; | 211 | }; |
219 | 212 | ||
220 | static const char *imx6q_dt_compat[] __initdata = { | 213 | static const char *imx6q_dt_compat[] __initdata = { |
221 | "fsl,imx6q-arm2", | ||
222 | "fsl,imx6q-sabrelite", | ||
223 | "fsl,imx6q-sabresd", | ||
224 | "fsl,imx6q", | 214 | "fsl,imx6q", |
225 | NULL, | 215 | NULL, |
226 | }; | 216 | }; |