add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/arch/arm/mach-imx/mach-imx6q.c
..
..
@@ -1,39 +1,20 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Copyright 2011-2013 Freescale Semiconductor, Inc.
3
4
  * Copyright 2011 Linaro Ltd.
4
- *
5
- * The code contained herein is licensed under the GNU General Public
6
- * License. You may obtain a copy of the GNU General Public License
7
- * Version 2 or later at the following locations:
8
- *
9
- * http://www.opensource.org/licenses/gpl-license.html
10
- * http://www.gnu.org/copyleft/gpl.html
11
5
  */
12
6
 
13
7
 #include <linux/clk.h>
14
-#include <linux/clkdev.h>
15
-#include <linux/cpu.h>
16
-#include <linux/delay.h>
17
-#include <linux/export.h>
18
-#include <linux/init.h>
19
-#include <linux/io.h>
20
-#include <linux/irq.h>
21
8
 #include <linux/irqchip.h>
22
-#include <linux/of.h>
23
-#include <linux/of_address.h>
24
-#include <linux/of_irq.h>
25
9
 #include <linux/of_platform.h>
26
-#include <linux/pm_opp.h>
27
10
 #include <linux/pci.h>
28
11
 #include <linux/phy.h>
29
-#include <linux/reboot.h>
30
12
 #include <linux/regmap.h>
31
13
 #include <linux/micrel_phy.h>
32
14
 #include <linux/mfd/syscon.h>
33
15
 #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
34
16
 #include <asm/mach/arch.h>
35
17
 #include <asm/mach/map.h>
36
-#include <asm/system_misc.h>
37
18
 
38
19
 #include "common.h"
39
20
 #include "cpuidle.h"
..
..
@@ -264,21 +245,15 @@
264
245
 
265
246
 static void __init imx6q_init_machine(void)
266
247
 {
267
-	struct device *parent;
268
-
269
248
 	if (cpu_is_imx6q() && imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)
270
249
 		imx_print_silicon_rev("i.MX6QP", IMX_CHIP_REVISION_1_0);
271
250
 	else
272
251
 		imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
273
252
 				imx_get_soc_revision());
274
253
 
275
-	parent = imx_soc_device_init();
276
-	if (parent == NULL)
277
-		pr_warn("failed to initialize soc device\n");
278
-
279
254
 	imx6q_enet_phy_init();
280
255
 
281
-	of_platform_default_populate(NULL, NULL, parent);
256
+	of_platform_default_populate(NULL, NULL, NULL);
282
257
 
283
258
 	imx_anatop_init();
284
259
 	cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init();