Skip to content

Commit d6d3dda

Browse files
arndbarndb
committed
Merge tag 'imx-soc-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/arm
i.MX SoC change for 6.6: - A change from Rob Herring to drop unused includes from i.MX platform code. * tag 'imx-soc-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx: Drop unused includes Link: https://lore.kernel.org/r/20230813133354.847010-2-shawnguo@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 00e1ff0 + 66ba9c0 commit d6d3dda

File tree

12 files changed

+4
-43
lines changed

12 files changed

+4
-43
lines changed

‎arch/arm/mach-imx/mach-imx1.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,11 @@
33
* Copyright (C) 2014 Alexander Shiyan <shc_work@mail.ru>
44
*/
55

6-
#include <linux/of_platform.h>
76
#include <asm/mach/arch.h>
8-
#include <asm/mach/map.h>
97

108
#include "common.h"
119
#include "hardware.h"
1210

13-
#define MX1_AVIC_ADDR 0x00223000
14-
1511
static void __init imx1_init_early(void)
1612
{
1713
mxc_set_cpu_type(MXC_CPU_MX1);

‎arch/arm/mach-imx/mach-imx25.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
* Copyright 2012 Sascha Hauer, Pengutronix
44
*/
55

6-
#include <linux/irq.h>
7-
#include <linux/of_address.h>
8-
#include <linux/of_irq.h>
9-
#include <linux/of_platform.h>
106
#include <asm/mach/arch.h>
11-
#include <asm/mach/time.h>
127
#include "common.h"
138
#include "hardware.h"
149

‎arch/arm/mach-imx/mach-imx27.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,8 @@
44
*/
55

66
#include <linux/init.h>
7-
#include <linux/irq.h>
8-
#include <linux/of_address.h>
9-
#include <linux/of_irq.h>
10-
#include <linux/of_platform.h>
11-
#include <linux/mm.h>
127
#include <asm/mach/arch.h>
138
#include <asm/mach/map.h>
14-
#include <asm/mach/time.h>
159

1610
#include "common.h"
1711
#include "hardware.h"

‎arch/arm/mach-imx/mach-imx35.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@
55
* based on imx27-dt.c
66
*/
77

8-
#include <linux/irq.h>
9-
#include <linux/irqdomain.h>
10-
#include <linux/of_irq.h>
11-
#include <linux/of_platform.h>
12-
#include <linux/clk-provider.h>
13-
#include <linux/clocksource.h>
148
#include <asm/mach/arch.h>
15-
#include <asm/mach/time.h>
16-
#include <asm/hardware/cache-l2x0.h>
179
#include "common.h"
1810
#include "mx35.h"
1911

‎arch/arm/mach-imx/mach-imx50.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* Copyright 2011 Linaro Ltd.
66
*/
77

8-
#include <linux/of_platform.h>
98
#include <asm/mach/arch.h>
109

1110
#include "common.h"

‎arch/arm/mach-imx/mach-imx51.c‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
*/
66

77
#include <linux/io.h>
8-
#include <linux/irq.h>
8+
#include <linux/of.h>
99
#include <linux/of_address.h>
10-
#include <linux/of_irq.h>
11-
#include <linux/of_platform.h>
1210
#include <asm/mach/arch.h>
13-
#include <asm/mach/time.h>
1411

1512
#include "common.h"
1613
#include "hardware.h"

‎arch/arm/mach-imx/mach-imx53.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,7 @@
44
* Copyright 2011 Linaro Ltd.
55
*/
66

7-
#include <linux/clk.h>
8-
#include <linux/clkdev.h>
9-
#include <linux/err.h>
10-
#include <linux/io.h>
11-
#include <linux/irq.h>
12-
#include <linux/of_irq.h>
13-
#include <linux/of_platform.h>
147
#include <asm/mach/arch.h>
15-
#include <asm/mach/time.h>
168

179
#include "common.h"
1810
#include "hardware.h"

‎arch/arm/mach-imx/mach-imx6sx.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55

66
#include <linux/irqchip.h>
77
#include <linux/of_platform.h>
8-
#include <linux/phy.h>
98
#include <linux/regmap.h>
109
#include <linux/mfd/syscon.h>
1110
#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
1211
#include <asm/mach/arch.h>
13-
#include <asm/mach/map.h>
1412

1513
#include "common.h"
1614
#include "cpuidle.h"

‎arch/arm/mach-imx/mach-imx6ul.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@
33
* Copyright (C) 2015 Freescale Semiconductor, Inc.
44
*/
55
#include <linux/irqchip.h>
6-
#include <linux/mfd/syscon.h>
76
#include <linux/of_platform.h>
8-
#include <linux/phy.h>
9-
#include <linux/regmap.h>
107
#include <asm/mach/arch.h>
11-
#include <asm/mach/map.h>
128

139
#include "common.h"
1410
#include "cpuidle.h"

‎arch/arm/mach-imx/mach-imx7d.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <linux/irqchip.h>
66
#include <linux/mfd/syscon.h>
77
#include <linux/mfd/syscon/imx7-iomuxc-gpr.h>
8-
#include <linux/of_platform.h>
8+
#include <linux/platform_device.h>
99
#include <linux/phy.h>
1010
#include <linux/regmap.h>
1111

0 commit comments

Comments
 (0)