aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-imx6q.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
-rw-r--r--arch/arm/mach-imx/mach-imx6q.c10
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 0b30aa8799d2..715029ec7abf 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>
@@ -158,12 +157,6 @@ static void __init imx6q_usb_init(void)
158 157
159static void __init imx6q_init_machine(void) 158static void __init imx6q_init_machine(void)
160{ 159{
161 /*
162 * This should be removed when all imx6q boards have pinctrl
163 * states for devices defined in device tree.
164 */
165 pinctrl_provide_dummies();
166
167 if (of_machine_is_compatible("fsl,imx6q-sabrelite")) 160 if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
168 imx6q_sabrelite_init(); 161 imx6q_sabrelite_init();
169 162
@@ -217,9 +210,6 @@ static struct sys_timer imx6q_timer = {
217}; 210};
218 211
219static const char *imx6q_dt_compat[] __initdata = { 212static const char *imx6q_dt_compat[] __initdata = {
220 "fsl,imx6q-arm2",
221 "fsl,imx6q-sabrelite",
222 "fsl,imx6q-sabresd",
223 "fsl,imx6q", 213 "fsl,imx6q",
224 NULL, 214 NULL,
225}; 215};