Skip to contentSkip to conversation

arm: mach-versatile: Remove dead code

PATCH In review Tom Rini 7 participants 41 messages Apr 30, 2024 – May 8, 2024

Subsystems (30)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/33 arm: mach-versatile: Remove dead code

This platform is no longer supported in tree, remove.

---
 arch/arm/mach-versatile/Makefile |  7 ----
 arch/arm/mach-versatile/reset.S  | 28 ---------------
 arch/arm/mach-versatile/timer.c  | 62 --------------------------------
 3 files changed, 97 deletions(-)
 delete mode 100644 arch/arm/mach-versatile/Makefile
 delete mode 100644 arch/arm/mach-versatile/reset.S
 delete mode 100644 arch/arm/mach-versatile/timer.c
arch/arm/mach-versatile/Makefile deleted +0 -7
deleted file mode 100644
index 858ca9414c05..000000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-
-obj-y	= timer.o
-obj-y	+= reset.o
arch/arm/mach-versatile/reset.S deleted +0 -28
deleted file mode 100644
index c7f1225fb298..000000000000
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  armboot - Startup Code for ARM926EJS CPU-core
- *
- *  Copyright (c) 2003  Texas Instruments
- *
- *  ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------
- *
- *  Copyright (c) 2001	Marius Gröger <[email protected]>
- *  Copyright (c) 2002	Alex Züpke <[email protected]>
- *  Copyright (c) 2002	Gary Jennejohn <[email protected]>
- *  Copyright (c) 2003	Richard Woodruff <[email protected]>
- *  Copyright (c) 2003	Kshitij <[email protected]>
- */
-
-	.align	5
-.globl reset_cpu
-reset_cpu:
-	ldr	r1, rstctl1	/* get clkm1 reset ctl */
-	mov	r3, #0x0
-	strh	r3, [r1]	/* clear it */
-	mov	r3, #0x8
-	strh	r3, [r1]	/* force dsp+arm reset */
-_loop_forever:
-	b	_loop_forever
-
-rstctl1:
-	.word	0xfffece10
arch/arm/mach-versatile/timer.c deleted +0 -62

62 lines not on this page · raw message

Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/33 include: Add missing headers in a few instances

A few headers rely on indirect inclusion of <linux/types.h> or <linux/kernel.h> so add them directly. In the case of <netdev.h> add a "struct bd_info;" as well rather than the large header chain to resolve that.

---
 include/mailbox.h       | 2 ++
 include/netdev.h        | 3 +++
 include/phy_interface.h | 1 +
 include/u-boot/sha1.h   | 2 ++
 include/u-boot/sha256.h | 2 ++
 include/u-boot/sha512.h | 2 ++
 6 files changed, 12 insertions(+)
include/mailbox.h +2 -0
index 323b6c2bc5d8..e70266fb61c9 100644
@@ -6,6 +6,8 @@
 #ifndef _MAILBOX_H
 #define _MAILBOX_H
 
+#include <linux/types.h>
+
 /**
  * A mailbox is a hardware mechanism for transferring small fixed-size messages
  * and/or notifications between the CPU on which U-Boot runs and some other
include/netdev.h +3 -0
index 2a7f40e5040e..2a06d9a261bb 100644
@@ -10,9 +10,12 @@
 
 #ifndef _NETDEV_H_
 #define _NETDEV_H_
+
+#include <linux/types.h>
 #include <phy_interface.h>
 
 struct udevice;
+struct bd_info;
 
 /*
  * Board and CPU-specific initialization functions
include/phy_interface.h +1 -0
index 31be3228c7c4..b74f4ccd84ad 100644
@@ -11,6 +11,7 @@
 #define _PHY_INTERFACE_H
 
 #include <string.h>
+#include <linux/kernel.h>
 
 typedef enum {
 	PHY_INTERFACE_MODE_NA, /* don't touch */
include/u-boot/sha1.h +2 -0
index 09fee594d263..c1e9f67068d4 100644
@@ -14,6 +14,8 @@
 #ifndef _SHA1_H
 #define _SHA1_H
 
+#include <linux/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
include/u-boot/sha256.h +2 -0
index 9aa1251789a3..a4fe176c0b46 100644
@@ -1,6 +1,8 @@
 #ifndef _SHA256_H
 #define _SHA256_H
 
+#include <linux/types.h>
+
 #define SHA256_SUM_LEN	32
 #define SHA256_DER_LEN	19
 
include/u-boot/sha512.h +2 -0
index 516729d77506..90bd96a3f8c2 100644
@@ -1,6 +1,8 @@
 #ifndef _SHA512_H
 #define _SHA512_H
 
+#include <linux/types.h>
+
 #define SHA384_SUM_LEN          48
 #define SHA384_DER_LEN          19
 #define SHA512_SUM_LEN          64
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 3/33 arm: xilinx: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-versal-net, mach-versal, mach-zynq and mach-zynqmp files and when needed add missing include files directly.

---
Cc: Michal Simek <[email protected]>

---
 arch/arm/mach-versal-net/clk.c                 | 2 +-
 arch/arm/mach-versal-net/cpu.c                 | 2 +-
 arch/arm/mach-versal/clk.c                     | 2 +-
 arch/arm/mach-versal/cpu.c                     | 2 +-
 arch/arm/mach-versal/mp.c                      | 3 ++-
 arch/arm/mach-zynq/clk.c                       | 1 -
 arch/arm/mach-zynq/cpu.c                       | 3 ++-
 arch/arm/mach-zynq/ddrc.c                      | 2 +-
 arch/arm/mach-zynq/slcr.c                      | 1 -
 arch/arm/mach-zynq/spl.c                       | 1 -
 arch/arm/mach-zynqmp-r5/cpu.c                  | 1 -
 arch/arm/mach-zynqmp/aes.c                     | 3 +--
 arch/arm/mach-zynqmp/clk.c                     | 2 +-
 arch/arm/mach-zynqmp/cpu.c                     | 4 +++-
 arch/arm/mach-zynqmp/ecc_spl_init.c            | 1 -
 arch/arm/mach-zynqmp/handoff.c                 | 1 -
 arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h | 2 ++
 arch/arm/mach-zynqmp/mp.c                      | 4 +++-
 arch/arm/mach-zynqmp/psu_spl_init.c            | 1 -
 arch/arm/mach-zynqmp/spl.c                     | 1 -
 20 files changed, 19 insertions(+), 20 deletions(-)
arch/arm/mach-versal-net/clk.c +1 -1
index d097de7afa63..a88b5101eb1b 100644
@@ -6,10 +6,10 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-versal-net/cpu.c +1 -1
index a82741e70fc8..59b0cb2e78f3 100644
@@ -6,11 +6,11 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-versal/clk.c +1 -1
index 5e3f44c77822..0c7d468f1dd0 100644
@@ -4,10 +4,10 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-versal/cpu.c +1 -1
index e4dc305d9288..7de431e55005 100644
@@ -4,11 +4,11 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-versal/mp.c +2 -1
index 2487b482ddb1..921ca49c3596 100644
@@ -4,7 +4,8 @@
  * Siva Durga Prasad Paladugu <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
+#include <linux/string.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-zynq/clk.c +0 -1
index 5e1ba8d43ed1..c1b018cf22e9 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2013 Xilinx, Inc. All rights reserved.
  */
 #include <clk.h>
-#include <common.h>
 #include <dm.h>
 #include <init.h>
 #include <malloc.h>
arch/arm/mach-zynq/cpu.c +2 -1
index 3b6518c71c90..c75e453d5730 100644
@@ -3,10 +3,11 @@
  * Copyright (C) 2012 Michal Simek <[email protected]>
  * Copyright (C) 2012 Xilinx, Inc. All rights reserved.
  */
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <zynqpl.h>
+#include <linux/errno.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
arch/arm/mach-zynq/ddrc.c +1 -1
index 28988ef95b5a..b9a2eef5a6f0 100644
@@ -4,7 +4,7 @@
  * Copyright (C) 2012 - 2017 Xilinx, Inc. All rights reserved.
  */
 
-#include <common.h>
+#include <linux/string.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-zynq/slcr.c +0 -1
index 5d9f4d23f34b..ef877df0fe85 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2013 - 2017 Xilinx Inc.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-zynq/spl.c +0 -1
index fea1c9b12ad1..8ef12ed65ceb 100644
@@ -2,7 +2,6 @@
 /*
  * (C) Copyright 2014 - 2017 Xilinx, Inc. Michal Simek
  */
-#include <common.h>
 #include <debug_uart.h>
 #include <hang.h>
 #include <image.h>
arch/arm/mach-zynqmp-r5/cpu.c +0 -1
index 0d368443d824..9a912dd5bd7c 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018 Xilinx, Inc. (Michal Simek)
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/armv7_mpu.h>
arch/arm/mach-zynqmp/aes.c +1 -2
index 8a2b7fdcbe9f..9a05fbf9c11b 100644
@@ -7,9 +7,8 @@
  * Christian Taedcke <[email protected]>
  */
 
-#include <common.h>
 #include <mach/zynqmp_aes.h>
-
+#include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <cpu_func.h>
 #include <memalign.h>
arch/arm/mach-zynqmp/clk.c +1 -1
index 3b05f8455bf5..dc8e2cbd3da4 100644
@@ -4,13 +4,13 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-zynqmp/cpu.c +3 -1
index 6ae27894ecd9..d7b5e99504c4 100644
@@ -4,14 +4,16 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
+#include <linux/errno.h>
+#include <linux/types.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 #include <zynqmp_firmware.h>
 #include <asm/cache.h>
arch/arm/mach-zynqmp/ecc_spl_init.c +0 -1
index f547d8e3a5bf..1eef10789514 100644
@@ -5,7 +5,6 @@
  *  Jorge Ramirez-Ortiz <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/ecc_spl_init.h>
arch/arm/mach-zynqmp/handoff.c +0 -1
index dce92438926e..b007307e1f36 100644
@@ -5,7 +5,6 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h +2 -0
index 2a9cffbd0f80..01a13d4c7c06 100644
@@ -9,6 +9,8 @@
 #ifndef ZYNQMP_AES_H
 #define ZYNQMP_AES_H
 
+#include <linux/types.h>
+
 struct zynqmp_aes {
 	u64 srcaddr;
 	u64 ivaddr;
arch/arm/mach-zynqmp/mp.c +3 -1
index aff9054212c5..9b46a25a1cbe 100644
@@ -4,14 +4,16 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <zynqmp_firmware.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/string.h>
 
 #define LOCK		0
 #define SPLIT		1
arch/arm/mach-zynqmp/psu_spl_init.c +0 -1
index b4d7f44bbeee..5b4d66359bfb 100644
@@ -4,7 +4,6 @@
  *
  * Michal Simek <[email protected]>
  */
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/psu_init_gpl.h>
 #include <linux/delay.h>
arch/arm/mach-zynqmp/spl.c +0 -1
index 979ff3aef6c2..6b67245f348c 100644
@@ -5,7 +5,6 @@
  * Michal Simek <[email protected]>
  */
 
-#include <common.h>
 #include <image.h>
 #include <init.h>
 #include <log.h>
Signature · 1 line
2.34.1
author
#3 lore raw

PATCH 4/33 arm: u8500: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-u8500 files and when needed add missing include files directly.

---
Cc: Stephan Gerhold <[email protected]>
Cc: Linus Walleij <[email protected]>

---
 arch/arm/mach-u8500/cache.c   | 2 +-
 arch/arm/mach-u8500/cpuinfo.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-u8500/cache.c +1 -1
index 05a91346a897..7541b567d0fd 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2019 Stephan Gerhold <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
arch/arm/mach-u8500/cpuinfo.c +0 -1
index ab05b8a51b23..6d4c6196c3df 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Stephan Gerhold <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 
Signature · 1 line
2.34.1
author
#5 lore raw

PATCH 5/33 arm: tegra: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-tegra and include/asm/arch-tegra files and when needed add missing include files directly.

---
Cc: Thierry Reding <[email protected]>
Cc: Svyatoslav Ryhel <[email protected]>

---
 arch/arm/include/asm/arch-tegra/ap.h       | 1 +
 arch/arm/include/asm/arch-tegra/cboot.h    | 2 ++
 arch/arm/mach-tegra/ap.c                   | 2 +-
 arch/arm/mach-tegra/arm64-mmu.c            | 1 -
 arch/arm/mach-tegra/board.c                | 2 +-
 arch/arm/mach-tegra/board2.c               | 2 +-
 arch/arm/mach-tegra/cache.c                | 1 -
 arch/arm/mach-tegra/cboot.c                | 1 -
 arch/arm/mach-tegra/clock.c                | 1 -
 arch/arm/mach-tegra/cmd_enterrcm.c         | 1 -
 arch/arm/mach-tegra/cpu.c                  | 1 -
 arch/arm/mach-tegra/crypto.c               | 1 -
 arch/arm/mach-tegra/dt-setup.c             | 1 -
 arch/arm/mach-tegra/emc.c                  | 1 -
 arch/arm/mach-tegra/fuse.c                 | 1 -
 arch/arm/mach-tegra/gpu.c                  | 1 -
 arch/arm/mach-tegra/ivc.c                  | 2 +-
 arch/arm/mach-tegra/pmc.c                  | 1 -
 arch/arm/mach-tegra/powergate.c            | 2 +-
 arch/arm/mach-tegra/spl.c                  | 1 -
 arch/arm/mach-tegra/sys_info.c             | 1 -
 arch/arm/mach-tegra/tegra114/clock.c       | 1 -
 arch/arm/mach-tegra/tegra114/cpu.c         | 1 -
 arch/arm/mach-tegra/tegra124/clock.c       | 2 +-
 arch/arm/mach-tegra/tegra124/cpu.c         | 1 -
 arch/arm/mach-tegra/tegra124/pmc.c         | 1 -
 arch/arm/mach-tegra/tegra124/psci.c        | 1 -
 arch/arm/mach-tegra/tegra124/xusb-padctl.c | 2 +-
 arch/arm/mach-tegra/tegra20/bct.c          | 1 -
 arch/arm/mach-tegra/tegra20/clock.c        | 1 -
 arch/arm/mach-tegra/tegra20/cpu.c          | 1 -
 arch/arm/mach-tegra/tegra20/display.c      | 1 -
 arch/arm/mach-tegra/tegra20/emc.c          | 2 +-
 arch/arm/mach-tegra/tegra20/pmu.c          | 1 -
 arch/arm/mach-tegra/tegra20/warmboot.c     | 1 -
 arch/arm/mach-tegra/tegra20/warmboot_avp.c | 2 +-
 arch/arm/mach-tegra/tegra210/clock.c       | 2 +-
 arch/arm/mach-tegra/tegra210/xusb-padctl.c | 2 +-
 arch/arm/mach-tegra/tegra30/bct.c          | 2 +-
 arch/arm/mach-tegra/tegra30/clock.c        | 1 -
 arch/arm/mach-tegra/tegra30/cpu.c          | 1 -
 arch/arm/mach-tegra/xusb-padctl-common.c   | 1 -
 arch/arm/mach-tegra/xusb-padctl-dummy.c    | 2 +-
 43 files changed, 16 insertions(+), 41 deletions(-)
arch/arm/include/asm/arch-tegra/ap.h +1 -0
index 78aeb25ac78e..b922b2d30ea0 100644
@@ -4,6 +4,7 @@
  * NVIDIA Corporation <www.nvidia.com>
  */
 #include <asm/types.h>
+#include <asm/arch-tegra/tegra.h>
 
 /* Stabilization delays, in usec */
 #define PLL_STABILIZATION_DELAY	(300)
arch/arm/include/asm/arch-tegra/cboot.h +2 -0
index 4e1da98d1f21..d0ba83ae8bc8 100644
@@ -6,6 +6,8 @@
 #ifndef _TEGRA_CBOOT_H_
 #define _TEGRA_CBOOT_H_
 
+#include <linux/errno.h>
+#include <linux/types.h>
 #include <net.h>
 
 #ifdef CONFIG_ARM64
arch/arm/mach-tegra/ap.c +1 -1
index 532730fe7270..1ea620e4ab59 100644
@@ -6,7 +6,7 @@
 
 /* Tegra AP (Application Processor) code */
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <linux/bug.h>
 #include <asm/io.h>
arch/arm/mach-tegra/arm64-mmu.c +0 -1
index ea4eac392d96..4fbe47a91e1e 100644
@@ -7,7 +7,6 @@
  * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
  */
 
-#include <common.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
 
arch/arm/mach-tegra/board.c +1 -1
index 327d70bd4cc0..c382e0428603 100644
@@ -4,7 +4,7 @@
  *  NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
arch/arm/mach-tegra/board2.c +1 -1
index adea12c9b7f9..479137e457cb 100644
@@ -4,7 +4,7 @@
  *  NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
arch/arm/mach-tegra/cache.c +0 -1
index d7063490e222..462364abf038 100644
@@ -5,7 +5,6 @@
 
 /* Tegra cache routines */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/ap.h>
 #if IS_ENABLED(CONFIG_TEGRA_GP_PADCTRL)
arch/arm/mach-tegra/cboot.c +0 -1
index 8f5bb2f261a9..c12543d71ac0 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016-2018, NVIDIA CORPORATION.
  */
 
-#include <common.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
arch/arm/mach-tegra/clock.c +0 -1
index 575da2bdb5a2..157e6c4911a4 100644
@@ -5,7 +5,6 @@
 
 /* Tegra SoC common clock control functions */
 
-#include <common.h>
 #include <div64.h>
 #include <dm.h>
 #include <errno.h>
arch/arm/mach-tegra/cmd_enterrcm.c +0 -1
index 92ff6cb1bf86..8fa1207e97a8 100644
@@ -24,7 +24,6 @@
  * (C) Copyright 2004 Texas Insturments
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
arch/arm/mach-tegra/cpu.c +0 -1
index 59ca8aeabac7..5f2a59171024 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2010-2019, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
arch/arm/mach-tegra/crypto.c +0 -1
index 893da35e0b9d..49e6a45243ad 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2010 - 2011 NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
 #include <log.h>
 #include <linux/errno.h>
 #include <asm/arch-tegra/crypto.h>
arch/arm/mach-tegra/dt-setup.c +0 -1
index c11494722bc7..f4ae602d5239 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2010-2016, NVIDIA CORPORATION.
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <stdlib.h>
 #include <asm/arch-tegra/cboot.h>
arch/arm/mach-tegra/emc.c +0 -1
index 2eea14b5a744..83fad35d4dcc 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include "emc.h"
 #include <asm/io.h>
arch/arm/mach-tegra/fuse.c +0 -1
index 83bd50553841..e9b5259ac701 100644
@@ -7,7 +7,6 @@
  *  Svyatoslav Ryhel <[email protected]>
  */
 
-#include <common.h>
 #include <linux/delay.h>
 #include <asm/io.h>
 
arch/arm/mach-tegra/gpu.c +0 -1
index 36538e7f96ad..23381759b797 100644
@@ -5,7 +5,6 @@
 
 /* Tegra vpr routines */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
arch/arm/mach-tegra/ivc.c +1 -1
index 66c1276f4b87..0445d5d48e5c 100644
@@ -3,11 +3,11 @@
  * Copyright (c) 2016, NVIDIA CORPORATION.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch-tegra/ivc.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 #include <linux/printk.h>
 
 #define TEGRA_IVC_ALIGN 64
arch/arm/mach-tegra/pmc.c +0 -1
index c4f5106750b8..3f968d4aeae8 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/global_data.h>
arch/arm/mach-tegra/powergate.c +1 -1
index 631bc04e9506..2a2f8467216e 100644
@@ -3,8 +3,8 @@
  * Copyright (c) 2014-2019, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <common.h>
 #include <errno.h>
+#include <time.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
arch/arm/mach-tegra/spl.c +0 -1
index ed897efc5f07..5df0eb28c96f 100644
@@ -5,7 +5,6 @@
  *
  * Allen Martin <[email protected]>
  */
-#include <common.h>
 #include <debug_uart.h>
 #include <log.h>
 #include <spl.h>
arch/arm/mach-tegra/sys_info.c +0 -1
index 5ad586ac17fb..11b404802466 100644
@@ -4,7 +4,6 @@
  * NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <linux/ctype.h>
 #if defined(CONFIG_TEGRA124) || defined(CONFIG_TEGRA30)
arch/arm/mach-tegra/tegra114/clock.c +0 -1
index 2ee755bc649c..d5cc8ac44dde 100644
@@ -6,7 +6,6 @@
 
 /* Tegra114 Clock control functions */
 
-#include <common.h>
 #include <init.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach-tegra/tegra114/cpu.c +0 -1
index 7d8f080c310c..3fe2d2d73246 100644
@@ -4,7 +4,6 @@
  * NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
arch/arm/mach-tegra/tegra124/clock.c +1 -1
index ed8b6d963816..4ac0c10c597d 100644
@@ -6,7 +6,7 @@
 
 /* Tegra124 Clock control functions */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach-tegra/tegra124/cpu.c +0 -1
index b1bfe8fb5e13..07892aedd3cb 100644
@@ -4,7 +4,6 @@
  * NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/ahb.h>
arch/arm/mach-tegra/tegra124/pmc.c +0 -1
index 3921ffb52af4..2294911501e7 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 
arch/arm/mach-tegra/tegra124/psci.c +0 -1
index ab102a622611..a50b681935aa 100644
@@ -4,7 +4,6 @@
  * Author: Jan Kiszka <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/arch/flow.h>
arch/arm/mach-tegra/tegra124/xusb-padctl.c +1 -1
index 69736aa39255..1153444267d3 100644
@@ -5,9 +5,9 @@
 
 #define pr_fmt(fmt) "tegra-xusb-padctl: " fmt
 
-#include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
 #include <linux/delay.h>
arch/arm/mach-tegra/tegra20/bct.c +0 -1
index b2c44f3d237c..e155b98cf655 100644
@@ -4,7 +4,6 @@
  * Copyright (c) 2022, Svyatoslav Ryhel <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <asm/arch-tegra/crypto.h>
arch/arm/mach-tegra/tegra20/clock.c +0 -1
index 109b73bfbe7f..6af20e9c782b 100644
@@ -7,7 +7,6 @@
 
 /* Tegra20 Clock control functions */
 
-#include <common.h>
 #include <errno.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-tegra/tegra20/cpu.c +0 -1
index e5b60598f7f7..1ba3930b5e6e 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch-tegra/pmc.h>
arch/arm/mach-tegra/tegra20/display.c +0 -1
index 4ba3fb23fd63..207e50aac905 100644
@@ -4,7 +4,6 @@
  *  NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/tegra.h>
arch/arm/mach-tegra/tegra20/emc.c +1 -1
index fb5e699c940d..e2ee8f124ac7 100644
@@ -3,7 +3,7 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  */
 
-#include <common.h>
+#include <config.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach-tegra/tegra20/pmu.c +0 -1
index 05d0668cdbaa..f2fe5d0fa9dc 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2010,2011 NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
 #include <i2c.h>
 #include <log.h>
 #include <tps6586x.h>
arch/arm/mach-tegra/tegra20/warmboot.c +0 -1
index 5e3a9ebaceb3..18034c83a1c2 100644
@@ -4,7 +4,6 @@
  * NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
arch/arm/mach-tegra/tegra20/warmboot_avp.c +1 -1
index 94ce762e01f5..65bbe1825356 100644
@@ -4,7 +4,7 @@
  * NVIDIA Corporation <www.nvidia.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/flow.h>
arch/arm/mach-tegra/tegra210/clock.c +1 -1
index 74817e0440b8..57ff0b2a19af 100644
@@ -6,10 +6,10 @@
 
 /* Tegra210 Clock control functions */
 
-#include <common.h>
 #include <errno.h>
 #include <init.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
arch/arm/mach-tegra/tegra210/xusb-padctl.c +1 -1
index 30d0395bb0e5..e409c2842e24 100644
@@ -5,9 +5,9 @@
 
 #define pr_fmt(fmt) "tegra-xusb-padctl: " fmt
 
-#include <common.h>
 #include <errno.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <dm/of_access.h>
 #include <dm/ofnode.h>
arch/arm/mach-tegra/tegra30/bct.c +1 -1
index cff1a3e98d27..250009ea8d8e 100644
@@ -4,9 +4,9 @@
  * Copyright (c) 2022, Svyatoslav Ryhel <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/arch-tegra/crypto.h>
 #include "bct.h"
 #include "uboot_aes.h"
arch/arm/mach-tegra/tegra30/clock.c +0 -1
index 0af8cde8c64d..7d61127920be 100644
@@ -6,7 +6,6 @@
 
 /* Tegra30 Clock control functions */
 
-#include <common.h>
 #include <errno.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-tegra/tegra30/cpu.c +0 -1
index 60bbf13ea525..51a9deab1fda 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2010-2014, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
arch/arm/mach-tegra/xusb-padctl-common.c +0 -1
index 28fdebe50a33..a3515d903a69 100644
@@ -5,7 +5,6 @@
 
 #define pr_fmt(fmt) "tegra-xusb-padctl: " fmt
 
-#include <common.h>
 #include <errno.h>
 #include <log.h>
 #include <linux/printk.h>
arch/arm/mach-tegra/xusb-padctl-dummy.c +1 -1
index f2d90302f6d2..1345b80747e8 100644
@@ -3,9 +3,9 @@
  * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <common.h>
 #include <errno.h>
 
+#include <linux/compiler.h>
 #include <asm/arch-tegra/xusb-padctl.h>
 
 struct tegra_xusb_phy * __weak tegra_xusb_phy_get(unsigned int type)
Signature · 1 line
2.34.1
author
#6 lore raw

PATCH 6/33 arm: stm32/stm32mp: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-stm32 and mach-stm32mp files and when needed add missing include files directly.

---
Cc: Patrick Delaunay <[email protected]>
Cc: Patrice Chotard <[email protected]>

---
 arch/arm/mach-stm32/soc.c                              | 1 -
 arch/arm/mach-stm32mp/boot_params.c                    | 2 +-
 arch/arm/mach-stm32mp/bsec.c                           | 1 -
 arch/arm/mach-stm32mp/cmd_stm32key.c                   | 1 -
 arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c    | 1 -
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c | 2 +-
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c    | 1 -
 arch/arm/mach-stm32mp/dram_init.c                      | 1 -
 arch/arm/mach-stm32mp/stm32mp1/cpu.c                   | 1 -
 arch/arm/mach-stm32mp/stm32mp1/fdt.c                   | 2 +-
 arch/arm/mach-stm32mp/stm32mp1/psci.c                  | 2 +-
 arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c         | 2 +-
 arch/arm/mach-stm32mp/stm32mp1/spl.c                   | 2 +-
 arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c            | 2 +-
 arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c            | 1 -
 arch/arm/mach-stm32mp/syscon.c                         | 1 -
 16 files changed, 7 insertions(+), 16 deletions(-)
arch/arm/mach-stm32/soc.c +0 -1
index 0bd8d7b22c4d..737e6809f8d3 100644
@@ -4,7 +4,6 @@
  * Author(s): Patrice Chotard, <[email protected]> for STMicroelectronics.
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
arch/arm/mach-stm32mp/boot_params.c +1 -1
index 158bf40cb97e..ebddf6a7dbcc 100644
@@ -5,7 +5,7 @@
 
 #define LOG_CATEGORY LOGC_ARCH
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <linux/libfdt.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-stm32mp/bsec.c +0 -1
index 5b869017ec1a..9ba7a6c9a892 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY UCLASS_MISC
 
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
arch/arm/mach-stm32mp/cmd_stm32key.c +0 -1
index c7fe232f86e0..0cb3c7a9fa44 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2019, STMicroelectronics - All Rights Reserved
  */
 
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <log.h>
arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +0 -1
index adee6e05b636..967fa4e06c0e 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020, STMicroelectronics - All Rights Reserved
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <command.h>
 #include <dfu.h>
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c +1 -1
index 35bed3199422..07c5e0456f82 100644
@@ -3,12 +3,12 @@
  * Copyright (C) 2020, STMicroelectronics - All Rights Reserved
  */
 
-#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <dfu.h>
 #include <malloc.h>
 #include <serial.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/arch/sys_proto.h>
 #include <dm/lists.h>
arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c +0 -1
index d18455bf36f1..4b1ed50e9fe5 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020, STMicroelectronics - All Rights Reserved
  */
 
-#include <common.h>
 #include <dfu.h>
 #include <g_dnl.h>
 #include <usb.h>
arch/arm/mach-stm32mp/dram_init.c +0 -1
index fb1208fc5d57..78b12fcbb6ac 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY LOGC_ARCH
 
-#include <common.h>
 #include <dm.h>
 #include <image.h>
 #include <init.h>
arch/arm/mach-stm32mp/stm32mp1/cpu.c +0 -1
index 524778f00c67..478c3efae73e 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY LOGC_ARCH
 
-#include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
arch/arm/mach-stm32mp/stm32mp1/fdt.c +1 -1
index d0b6c3cc5a55..e1e4dc04e01c 100644
@@ -5,11 +5,11 @@
 
 #define LOG_CATEGORY LOGC_ARCH
 
-#include <common.h>
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <log.h>
 #include <tee.h>
+#include <mach/stm32.h>
 #include <asm/arch/sys_proto.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
arch/arm/mach-stm32mp/stm32mp1/psci.c +1 -1
index 4f2379df45fb..7772546b2fef 100644
@@ -4,7 +4,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
 #include <asm/gic.h>
@@ -13,6 +12,7 @@
 #include <asm/secure.h>
 #include <hang.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 /* PWR */
 #define PWR_CR3					0x0c
arch/arm/mach-stm32mp/stm32mp1/pwr_regulator.c +1 -1
index 846637ab162e..79c44188cc56 100644
@@ -5,10 +5,10 @@
 
 #define LOG_CATEGORY UCLASS_REGULATOR
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
 #include <dm/device-internal.h>
arch/arm/mach-stm32mp/stm32mp1/spl.c +1 -1
index 6c79259b2c82..7a8fd3178adf 100644
@@ -5,7 +5,7 @@
 
 #define LOG_CATEGORY LOGC_ARCH
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <hang.h>
arch/arm/mach-stm32mp/stm32mp1/stm32mp13x.c +1 -1
index 845d973ad1b2..4a811065fc31 100644
@@ -5,7 +5,7 @@
 
 #define LOG_CATEGORY LOGC_ARCH
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <syscon.h>
 #include <asm/io.h>
arch/arm/mach-stm32mp/stm32mp1/stm32mp15x.c +0 -1
index d75ec99d6a17..f096fe538d88 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY LOGC_ARCH
 
-#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach-stm32mp/syscon.c +0 -1
index a2e351d74a7a..8bcbd9793404 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
  */
 
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <syscon.h>
Signature · 1 line
2.34.1
author
#7 lore raw

PATCH 7/33 arm: sunxi: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-sunxi and board/sunxi files and when needed add missing include files directly.

---
Cc: Jagan Teki <[email protected]>
Cc: Andre Przywara <[email protected]>

---
 arch/arm/cpu/armv7/sunxi/psci.c                     | 1 -
 arch/arm/cpu/armv7/sunxi/sram.c                     | 1 -
 arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c         | 1 -
 arch/arm/mach-sunxi/dram_timings/ddr3_1333.c        | 1 -
 arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c   | 1 -
 arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c      | 1 -
 arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c | 1 -
 arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c     | 1 -
 arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c        | 1 -
 arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c     | 1 -
 board/sunxi/board.c                                 | 1 -
 board/sunxi/chip.c                                  | 1 -
 board/sunxi/dram_sun4i_auto.c                       | 1 -
 board/sunxi/dram_sun5i_auto.c                       | 1 -
 board/sunxi/gmac.c                                  | 1 -
 15 files changed, 15 deletions(-)
arch/arm/cpu/armv7/sunxi/psci.c +0 -1
index 5cb8cfa6cf3f..4c30f3294b7a 100644
@@ -7,7 +7,6 @@
  * which was based on code by Carl van Schaik <[email protected]>.
  */
 #include <config.h>
-#include <common.h>
 #include <asm/cache.h>
 
 #include <asm/arch/cpu.h>
arch/arm/cpu/armv7/sunxi/sram.c +0 -1
index 28ff6a1b7c23..bc25719c9c46 100644
@@ -9,7 +9,6 @@
  * SRAM init for older sunxi SoCs.
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c +0 -1
index 9077f86a8b4c..3666dddca15c 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/ddr3_1333.c +0 -1
index 0471e8a49e58..ceaafd6ec6fa 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c +0 -1
index 232b4fe2df7f..3faf8d5bd974 100644
@@ -11,7 +11,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c +0 -1
index b6d6a6874682..ce2ffa7a020e 100644
@@ -11,7 +11,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c +0 -1
index c11cb8678f64..e6446b9180da 100644
@@ -9,7 +9,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c +0 -1
index 2136ca3a4cb0..afe8e25c7f58 100644
@@ -19,7 +19,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c +0 -1
index 10008601134a..c243b574406d 100644
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c +0 -1
index bd57e2f6aac2..bc47a4638533 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
board/sunxi/board.c +0 -1
index 1313b01dcea5..ed86f1df5dc4 100644
@@ -10,7 +10,6 @@
  * Some board init for the Allwinner A10-evb board.
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <dm.h>
 #include <env.h>
board/sunxi/chip.c +0 -1
index eeee6319e799..270af2506d21 100644
@@ -5,7 +5,6 @@
  * Based on initial code from Maxime Ripard
  */
 
-#include <common.h>
 #include <malloc.h>
 #include <dm.h>
 #include <w1.h>
board/sunxi/dram_sun4i_auto.c +0 -1
index 547d1c0cb4de..4b78919a5baa 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <init.h>
 #include <asm/arch/dram.h>
 
board/sunxi/dram_sun5i_auto.c +0 -1
index 517506ccc4f0..8976e3b16d68 100644
@@ -1,6 +1,5 @@
 /* DRAM parameters for auto dram configuration on sun5i and sun7i */
 
-#include <common.h>
 #include <init.h>
 #include <asm/arch/dram.h>
 
board/sunxi/gmac.c +0 -1
index 2a885305ebe0..710e821e3fc8 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <netdev.h>
 #include <miiphy.h>
 #include <asm/io.h>
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 7/33
#8 lore raw

Re: [PATCH 07/33] arm: sunxi: Remove <common.h> and add needed includes

On Tue, 30 Apr 2024 07:35:33 -0600
Tom Rini <[email protected]> wrote:

Hi,

Quoted 2 lines

Remove <common.h> from all mach-sunxi and board/sunxi files and when needed add missing include files directly.

Oh wow, many thanks, that takes one point of my TODO list! After cherry-picking the netdev.h and phy_interface.h changes from 01/33, I compiled all 168 sunxi boards successfully.

Quoted 1 line

Cheers,
Andre

Quoted 185 lines

---
Cc: Jagan Teki <[email protected]>
Cc: Andre Przywara <[email protected]>

---
 arch/arm/cpu/armv7/sunxi/psci.c                     | 1 -
 arch/arm/cpu/armv7/sunxi/sram.c                     | 1 -
 arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c         | 1 -
 arch/arm/mach-sunxi/dram_timings/ddr3_1333.c        | 1 -
 arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c   | 1 -
 arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c      | 1 -
 arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c | 1 -
 arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c     | 1 -
 arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c        | 1 -
 arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c     | 1 -
 board/sunxi/board.c                                 | 1 -
 board/sunxi/chip.c                                  | 1 -
 board/sunxi/dram_sun4i_auto.c                       | 1 -
 board/sunxi/dram_sun5i_auto.c                       | 1 -
 board/sunxi/gmac.c                                  | 1 -
 15 files changed, 15 deletions(-)
arch/arm/cpu/armv7/sunxi/psci.c +0 -1
index 5cb8cfa6cf3f..4c30f3294b7a 100644
@@ -7,7 +7,6 @@
  * which was based on code by Carl van Schaik <[email protected]>.
  */
 #include <config.h>
-#include <common.h>
 #include <asm/cache.h>
 
 #include <asm/arch/cpu.h>
arch/arm/cpu/armv7/sunxi/sram.c +0 -1
index 28ff6a1b7c23..bc25719c9c46 100644
@@ -9,7 +9,6 @@
  * SRAM init for older sunxi SoCs.
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-sunxi/dram_timings/ddr2_v3s.c +0 -1
index 9077f86a8b4c..3666dddca15c 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/ddr3_1333.c +0 -1
index 0471e8a49e58..ceaafd6ec6fa 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c +0 -1
index 232b4fe2df7f..3faf8d5bd974 100644
@@ -11,7 +11,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h616_lpddr3.c +0 -1
index b6d6a6874682..ce2ffa7a020e 100644
@@ -11,7 +11,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c +0 -1
index c11cb8678f64..e6446b9180da 100644
@@ -9,7 +9,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c +0 -1
index 2136ca3a4cb0..afe8e25c7f58 100644
@@ -19,7 +19,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/h6_lpddr3.c +0 -1
index 10008601134a..c243b574406d 100644
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
arch/arm/mach-sunxi/dram_timings/lpddr3_stock.c +0 -1
index bd57e2f6aac2..bc47a4638533 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <asm/arch/dram.h>
 #include <asm/arch/cpu.h>
 
board/sunxi/board.c +0 -1
index 1313b01dcea5..ed86f1df5dc4 100644
@@ -10,7 +10,6 @@
  * Some board init for the Allwinner A10-evb board.
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <dm.h>
 #include <env.h>
board/sunxi/chip.c +0 -1
index eeee6319e799..270af2506d21 100644
@@ -5,7 +5,6 @@
  * Based on initial code from Maxime Ripard
  */
 
-#include <common.h>
 #include <malloc.h>
 #include <dm.h>
 #include <w1.h>
board/sunxi/dram_sun4i_auto.c +0 -1
index 547d1c0cb4de..4b78919a5baa 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <init.h>
 #include <asm/arch/dram.h>
 
board/sunxi/dram_sun5i_auto.c +0 -1
index 517506ccc4f0..8976e3b16d68 100644
@@ -1,6 +1,5 @@
 /* DRAM parameters for auto dram configuration on sun5i and sun7i */
 
-#include <common.h>
 #include <init.h>
 #include <asm/arch/dram.h>
 
board/sunxi/gmac.c +0 -1
index 2a885305ebe0..710e821e3fc8 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <netdev.h>
 #include <miiphy.h>
 #include <asm/io.h>
author
#9 lore raw

PATCH 8/33 arm: socfpga: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-socfpga files and when needed add missing include files directly.

---
Cc: Marek Vasut <[email protected]>
Cc: Simon Goldschmidt <[email protected]>
Cc: Tien Fong Chee <[email protected]>

---
 arch/arm/mach-socfpga/board.c                      | 2 +-
 arch/arm/mach-socfpga/clock_manager.c              | 2 +-
 arch/arm/mach-socfpga/clock_manager_agilex.c       | 1 -
 arch/arm/mach-socfpga/clock_manager_arria10.c      | 1 -
 arch/arm/mach-socfpga/clock_manager_gen5.c         | 1 -
 arch/arm/mach-socfpga/clock_manager_n5x.c          | 1 -
 arch/arm/mach-socfpga/clock_manager_s10.c          | 2 +-
 arch/arm/mach-socfpga/firewall.c                   | 2 +-
 arch/arm/mach-socfpga/fpga_manager.c               | 2 +-
 arch/arm/mach-socfpga/freeze_controller.c          | 2 +-
 arch/arm/mach-socfpga/include/mach/clock_manager.h | 2 ++
 arch/arm/mach-socfpga/mailbox_s10.c                | 1 -
 arch/arm/mach-socfpga/misc.c                       | 2 +-
 arch/arm/mach-socfpga/misc_arria10.c               | 2 +-
 arch/arm/mach-socfpga/misc_gen5.c                  | 2 +-
 arch/arm/mach-socfpga/misc_soc64.c                 | 1 -
 arch/arm/mach-socfpga/mmu-arm64_s10.c              | 1 -
 arch/arm/mach-socfpga/pinmux_arria10.c             | 2 +-
 arch/arm/mach-socfpga/reset_manager_arria10.c      | 1 -
 arch/arm/mach-socfpga/reset_manager_gen5.c         | 2 +-
 arch/arm/mach-socfpga/reset_manager_s10.c          | 1 -
 arch/arm/mach-socfpga/scan_manager.c               | 2 +-
 arch/arm/mach-socfpga/secure_reg_helper.c          | 1 -
 arch/arm/mach-socfpga/secure_vab.c                 | 1 -
 arch/arm/mach-socfpga/smc_api.c                    | 3 ++-
 arch/arm/mach-socfpga/spl_a10.c                    | 2 +-
 arch/arm/mach-socfpga/spl_agilex.c                 | 1 -
 arch/arm/mach-socfpga/spl_gen5.c                   | 1 -
 arch/arm/mach-socfpga/spl_n5x.c                    | 1 -
 arch/arm/mach-socfpga/spl_s10.c                    | 1 -
 arch/arm/mach-socfpga/spl_soc64.c                  | 1 -
 arch/arm/mach-socfpga/system_manager_gen5.c        | 1 -
 arch/arm/mach-socfpga/system_manager_soc64.c       | 1 -
 arch/arm/mach-socfpga/timer.c                      | 2 +-
 arch/arm/mach-socfpga/timer_s10.c                  | 1 -
 arch/arm/mach-socfpga/vab.c                        | 2 +-
 arch/arm/mach-socfpga/wrap_handoff_soc64.c         | 1 -
 arch/arm/mach-socfpga/wrap_iocsr_config.c          | 2 +-
 arch/arm/mach-socfpga/wrap_pinmux_config.c         | 3 ++-
 arch/arm/mach-socfpga/wrap_pll_config.c            | 2 +-
 arch/arm/mach-socfpga/wrap_pll_config_soc64.c      | 1 -
 arch/arm/mach-socfpga/wrap_sdram_config.c          | 4 +++-
 42 files changed, 26 insertions(+), 41 deletions(-)
arch/arm/mach-socfpga/board.c +1 -1
index 616e1afe5de6..feaf5ce45964 100644
@@ -5,7 +5,7 @@
  * Copyright (C) 2015 Marek Vasut <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/misc.h>
arch/arm/mach-socfpga/clock_manager.c +1 -1
index 9e645a425317..4fcb13f17e6c 100644
@@ -3,10 +3,10 @@
  *  Copyright (C) 2013-2017 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 #include <command.h>
 #include <init.h>
arch/arm/mach-socfpga/clock_manager_agilex.c +0 -1
index 28f593b60e63..9987d5bcee6f 100644
@@ -5,7 +5,6 @@
  */
 
 #include <clk.h>
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
arch/arm/mach-socfpga/clock_manager_arria10.c +0 -1
index 8ab18f6b7252..58b9321131a9 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016-2017 Intel Corporation
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <malloc.h>
 #include <asm/io.h>
arch/arm/mach-socfpga/clock_manager_gen5.c +0 -1
index 8fa2760798b8..154ad2154ae7 100644
@@ -3,7 +3,6 @@
  *  Copyright (C) 2013-2017 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
 #include <time.h>
 #include <asm/io.h>
 #include <dm.h>
arch/arm/mach-socfpga/clock_manager_n5x.c +0 -1
index 0ed480de670d..c4c071330fc3 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/system_manager.h>
 #include <asm/global_data.h>
arch/arm/mach-socfpga/clock_manager_s10.c +1 -1
index 45300336d52a..1e148947a338 100644
@@ -4,7 +4,7 @@
  *
  */
 
-#include <common.h>
+#include <linux/errno.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
arch/arm/mach-socfpga/firewall.c +1 -1
index 69229dc651e4..4dec47b8e960 100644
@@ -4,8 +4,8 @@
  *
  */
 
+#include <mach/base_addr_soc64.h>
 #include <asm/io.h>
-#include <common.h>
 #include <asm/arch/firewall.h>
 #include <asm/arch/system_manager.h>
 
arch/arm/mach-socfpga/fpga_manager.c +1 -1
index 18d692c63144..c946d4c38d96 100644
@@ -7,7 +7,7 @@
  * platform code, the real meat is located in drivers/fpga/socfpga.c .
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/fpga_manager.h>
arch/arm/mach-socfpga/freeze_controller.c +1 -1
index 561d3408cd8f..7c86350d5eac 100644
@@ -4,7 +4,7 @@
  */
 
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/freeze_controller.h>
arch/arm/mach-socfpga/include/mach/clock_manager.h +2 -0
index 6c9d32b9dd8a..49f3fb2e7057 100644
@@ -6,6 +6,8 @@
 #ifndef _CLOCK_MANAGER_H_
 #define _CLOCK_MANAGER_H_
 
+#include <linux/types.h>
+
 phys_addr_t socfpga_get_clkmgr_addr(void);
 
 #ifndef __ASSEMBLY__
arch/arm/mach-socfpga/mailbox_s10.c +0 -1
index 101af2385529..4c86f1e99170 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/system_manager.h>
arch/arm/mach-socfpga/misc.c +1 -1
index 80ad0870341b..495ba2a0d418 100644
@@ -3,7 +3,7 @@
  *  Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <hang.h>
arch/arm/mach-socfpga/misc_arria10.c +1 -1
index 93c9e8b0fb40..34c21317894d 100644
@@ -4,7 +4,7 @@
  */
 
 #include <altera.h>
-#include <common.h>
+#include <config.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <init.h>
arch/arm/mach-socfpga/misc_gen5.c +1 -1
index e7500c16f720..b898b6f8f226 100644
@@ -3,7 +3,7 @@
  *  Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/global_data.h>
arch/arm/mach-socfpga/misc_soc64.c +0 -1
index 2acdfad07b35..ad1ef0db1869 100644
@@ -5,7 +5,6 @@
  */
 
 #include <altera.h>
-#include <common.h>
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/misc.h>
 #include <asm/arch/reset_manager.h>
arch/arm/mach-socfpga/mmu-arm64_s10.c +0 -1
index 91c6d7c55f13..b8e40d9a7889 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
 
arch/arm/mach-socfpga/pinmux_arria10.c +1 -1
index f378fce7f02d..c8074f47e760 100644
@@ -4,9 +4,9 @@
  */
 
 #include <log.h>
+#include <linux/errno.h>
 #include <asm/arch/pinmux.h>
 #include <asm/io.h>
-#include <common.h>
 #include <fdtdec.h>
 
 static int do_pinctr_pin(const void *blob, int child, const char *node_name)
arch/arm/mach-socfpga/reset_manager_arria10.c +0 -1
index 27c030801134..da335f4292cb 100644
@@ -9,7 +9,6 @@
 #include <asm/arch/misc.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/system_manager.h>
-#include <common.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <wait_bit.h>
arch/arm/mach-socfpga/reset_manager_gen5.c +1 -1
index a65860ef021a..9395122dae13 100644
@@ -4,7 +4,7 @@
  */
 
 
-#include <common.h>
+#include <mach/base_addr_ac5.h>
 #include <asm/io.h>
 #include <asm/arch/fpga_manager.h>
 #include <asm/arch/reset_manager.h>
arch/arm/mach-socfpga/reset_manager_s10.c +0 -1
index f47fec10a0c6..dd0383c7c76d 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <hang.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
arch/arm/mach-socfpga/scan_manager.c +1 -1
index 36d6880141ea..f8811525da4d 100644
@@ -3,7 +3,7 @@
  *  Copyright (C) 2013 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/freeze_controller.h>
arch/arm/mach-socfpga/secure_reg_helper.c +0 -1
index 0d4f45f33da5..802a966ce87a 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <hang.h>
 #include <asm/io.h>
 #include <asm/system.h>
arch/arm/mach-socfpga/secure_vab.c +0 -1
index e2db58850643..4347bf6e7927 100644
@@ -8,7 +8,6 @@
 #include <asm/arch/secure_vab.h>
 #include <asm/arch/smc_api.h>
 #include <asm/unaligned.h>
-#include <common.h>
 #include <exports.h>
 #include <linux/errno.h>
 #include <linux/intel-smc.h>
arch/arm/mach-socfpga/smc_api.c +2 -1
index 8ffc7a472b5b..ebaa0b8fa170 100644
@@ -4,10 +4,11 @@
  *
  */
 
-#include <common.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
+#include <linux/errno.h>
 #include <linux/intel-smc.h>
+#include <linux/string.h>
 
 int invoke_smc(u32 func_id, u64 *args, int arg_len, u64 *ret_arg, int ret_len)
 {
arch/arm/mach-socfpga/spl_a10.c +1 -1
index 3981d2d4f140..af5bed162e2f 100644
@@ -3,7 +3,7 @@
  *  Copyright (C) 2012-2021 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
arch/arm/mach-socfpga/spl_agilex.c +0 -1
index ee5a9dc1e2f5..cd1bf48d8324 100644
@@ -10,7 +10,6 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
-#include <common.h>
 #include <hang.h>
 #include <image.h>
 #include <spl.h>
arch/arm/mach-socfpga/spl_gen5.c +0 -1
index 287fbd1713c6..d53592cba4d8 100644
@@ -3,7 +3,6 @@
  *  Copyright (C) 2012 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-socfpga/spl_n5x.c +0 -1
index d056871d2924..a19602039397 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/arch/firewall.h>
 #include <asm/arch/mailbox_s10.h>
arch/arm/mach-socfpga/spl_s10.c +0 -1
index c20e87cdbef3..9b3c75f97677 100644
@@ -11,7 +11,6 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
-#include <common.h>
 #include <debug_uart.h>
 #include <image.h>
 #include <spl.h>
arch/arm/mach-socfpga/spl_soc64.c +0 -1
index ba6efc1d8641..4fe67ea08112 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <spl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/arm/mach-socfpga/system_manager_gen5.c +0 -1
index 09caebb3c882..c377d1c32c79 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2013-2017 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/system_manager.h>
 #include <asm/arch/fpga_manager.h>
arch/arm/mach-socfpga/system_manager_soc64.c +0 -1
index 958bb5107b5b..4b42158be9d9 100644
@@ -8,7 +8,6 @@
 #include <asm/arch/system_manager.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
-#include <common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-socfpga/timer.c +1 -1
index d9e8c84bfcfe..99de5744c48f 100644
@@ -3,7 +3,7 @@
  *  Copyright (C) 2012 Altera Corporation <www.altera.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
arch/arm/mach-socfpga/timer_s10.c +0 -1
index 84b13ce9d3a9..809335863190 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <init.h>
 #include <div64.h>
 #include <asm/io.h>
arch/arm/mach-socfpga/vab.c +1 -1
index e146f2c52901..e74c71cfbb44 100644
@@ -4,9 +4,9 @@
  *
  */
 
+#include <vsprintf.h>
 #include <asm/arch/secure_vab.h>
 #include <command.h>
-#include <common.h>
 #include <linux/ctype.h>
 
 static int do_vab(struct cmd_tbl *cmdtp, int flag, int argc,
arch/arm/mach-socfpga/wrap_handoff_soc64.c +0 -1
index 6aa9bb26b4ec..92051d19b737 100644
@@ -6,7 +6,6 @@
 
 #include <asm/arch/handoff_soc64.h>
 #include <asm/io.h>
-#include <common.h>
 #include <errno.h>
 #include "log.h"
 
arch/arm/mach-socfpga/wrap_iocsr_config.c +1 -1
index ce86f04cad1f..43ce329dd10f 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Marek Vasut <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <errno.h>
 #include <asm/arch/clock_manager.h>
 
arch/arm/mach-socfpga/wrap_pinmux_config.c +2 -1
index 33ca14c9dc76..e494d2eb3f9f 100644
@@ -3,8 +3,9 @@
  * Copyright (C) 2015 Marek Vasut <[email protected]>
  */
 
-#include <common.h>
 #include <errno.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
 
 /* Board-specific header. */
 #include <qts/pinmux_config.h>
arch/arm/mach-socfpga/wrap_pll_config.c +1 -1
index 0c40ae987613..e0d0f8f81b7c 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Marek Vasut <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/clock_manager.h>
 #include <qts/pll_config.h>
 
arch/arm/mach-socfpga/wrap_pll_config_soc64.c +0 -1
index 6a0d6b5ead72..f13581033e6b 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/arch/clock_manager.h>
 #include <asm/io.h>
 #include <asm/arch/handoff_soc64.h>
arch/arm/mach-socfpga/wrap_sdram_config.c +3 -1
index cd3a0f663355..8f3fbaf80c8c 100644
@@ -3,8 +3,10 @@
  * Copyright (C) 2015 Marek Vasut <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <errno.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
 #include <asm/arch/sdram.h>
 
 /* Board-specific header. */
Signature · 1 line
2.34.1
author
#10 lore raw

PATCH 9/33 arm: s5pc1xx: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-s5pc1xx and cpu/armv7/s5p-common files and when needed add missing include files directly.

---
Cc: Minkyu Kang <[email protected]>

---
 arch/arm/cpu/armv7/s5p-common/cpu_info.c | 1 -
 arch/arm/cpu/armv7/s5p-common/pwm.c      | 2 +-
 arch/arm/cpu/armv7/s5p-common/sromc.c    | 2 +-
 arch/arm/cpu/armv7/s5p-common/timer.c    | 1 -
 arch/arm/mach-s5pc1xx/cache.c            | 1 -
 arch/arm/mach-s5pc1xx/clock.c            | 2 +-
 arch/arm/mach-s5pc1xx/pinmux.c           | 1 -
 7 files changed, 3 insertions(+), 7 deletions(-)
arch/arm/cpu/armv7/s5p-common/cpu_info.c +0 -1
index fb2920950d42..4331dde7643d 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2009 Samsung Electronics
  * Minkyu Kang <[email protected]>
  */
-#include <common.h>
 #include <display_options.h>
 #include <fdtdec.h>
 #include <init.h>
arch/arm/cpu/armv7/s5p-common/pwm.c +1 -1
index 5068327d3c5f..986b585b70e9 100644
@@ -5,7 +5,7 @@
  * Donghwa Lee <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
arch/arm/cpu/armv7/s5p-common/sromc.c +1 -1
index 0fc170936ae4..c0035fb18ebb 100644
@@ -4,7 +4,7 @@
  * Naveen Krishna Ch <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/sromc.h>
 
arch/arm/cpu/armv7/s5p-common/timer.c +0 -1
index 9d981cce145d..12994ecc843e 100644
@@ -6,7 +6,6 @@
  * Minkyu Kang <[email protected]>
  */
 
-#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <time.h>
arch/arm/mach-s5pc1xx/cache.c +0 -1
index b390bdf82784..f0aec7c0fe02 100644
@@ -7,7 +7,6 @@
  * based on arch/arm/cpu/armv7/omap3/cache.S
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 
arch/arm/mach-s5pc1xx/clock.c +1 -1
index c90c341b5082..b92ce1152f66 100644
@@ -5,7 +5,7 @@
  * Heungjun Kim <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
arch/arm/mach-s5pc1xx/pinmux.c +0 -1
index 818d75164dee..23b9252827ae 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/pinmux.h>
 
 int exynos_pinmux_config(int peripheral, int flags)
Signature · 1 line
2.34.1
author
#11 lore raw

PATCH 10/33 arm: rockchip: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-rockchip and include/asm/arch-rockchip files and when needed add missing include files directly.

---
Cc: Simon Glass <[email protected]>
Cc: Philipp Tomsich <[email protected]>
Cc: Kever Yang <[email protected]>

---
 arch/arm/include/asm/arch-rockchip/bootrom.h  | 2 ++
 arch/arm/include/asm/arch-rockchip/clock.h    | 2 ++
 arch/arm/mach-rockchip/board.c                | 2 +-
 arch/arm/mach-rockchip/boot_mode.c            | 1 -
 arch/arm/mach-rockchip/bootrom.c              | 1 -
 arch/arm/mach-rockchip/cpu-info.c             | 1 -
 arch/arm/mach-rockchip/px30-board-tpl.c       | 1 -
 arch/arm/mach-rockchip/px30/clk_px30.c        | 1 -
 arch/arm/mach-rockchip/px30/px30.c            | 1 -
 arch/arm/mach-rockchip/px30/syscon_px30.c     | 1 -
 arch/arm/mach-rockchip/rk3036-board-spl.c     | 1 -
 arch/arm/mach-rockchip/rk3036/clk_rk3036.c    | 1 -
 arch/arm/mach-rockchip/rk3036/rk3036.c        | 1 -
 arch/arm/mach-rockchip/rk3036/sdram_rk3036.c  | 2 +-
 arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 1 -
 arch/arm/mach-rockchip/rk3066/clk_rk3066.c    | 1 -
 arch/arm/mach-rockchip/rk3066/rk3066.c        | 1 -
 arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 1 -
 arch/arm/mach-rockchip/rk3128/clk_rk3128.c    | 1 -
 arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 1 -
 arch/arm/mach-rockchip/rk3188/clk_rk3188.c    | 1 -
 arch/arm/mach-rockchip/rk3188/rk3188.c        | 1 -
 arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 1 -
 arch/arm/mach-rockchip/rk322x/clk_rk322x.c    | 1 -
 arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 1 -
 arch/arm/mach-rockchip/rk3288/clk_rk3288.c    | 1 -
 arch/arm/mach-rockchip/rk3288/rk3288.c        | 1 -
 arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 1 -
 arch/arm/mach-rockchip/rk3308/clk_rk3308.c    | 1 -
 arch/arm/mach-rockchip/rk3308/rk3308.c        | 1 -
 arch/arm/mach-rockchip/rk3308/syscon_rk3308.c | 1 -
 arch/arm/mach-rockchip/rk3328/clk_rk3328.c    | 1 -
 arch/arm/mach-rockchip/rk3328/rk3328.c        | 1 -
 arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 1 -
 arch/arm/mach-rockchip/rk3368/clk_rk3368.c    | 1 -
 arch/arm/mach-rockchip/rk3368/rk3368.c        | 1 -
 arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 1 -
 arch/arm/mach-rockchip/rk3399/clk_rk3399.c    | 1 -
 arch/arm/mach-rockchip/rk3399/rk3399.c        | 1 -
 arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 1 -
 arch/arm/mach-rockchip/rk3568/clk_rk3568.c    | 1 -
 arch/arm/mach-rockchip/rk3568/rk3568.c        | 1 -
 arch/arm/mach-rockchip/rk3568/syscon_rk3568.c | 1 -
 arch/arm/mach-rockchip/rk3588/clk_rk3588.c    | 1 -
 arch/arm/mach-rockchip/rk3588/rk3588.c        | 1 -
 arch/arm/mach-rockchip/rk3588/syscon_rk3588.c | 1 -
 arch/arm/mach-rockchip/rv1108/clk_rv1108.c    | 1 -
 arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 1 -
 arch/arm/mach-rockchip/rv1126/clk_rv1126.c    | 1 -
 arch/arm/mach-rockchip/rv1126/rv1126.c        | 1 -
 arch/arm/mach-rockchip/rv1126/syscon_rv1126.c | 1 -
 arch/arm/mach-rockchip/sdram.c                | 2 +-
 arch/arm/mach-rockchip/spl-boot-order.c       | 1 -
 arch/arm/mach-rockchip/tpl.c                  | 1 -
 54 files changed, 7 insertions(+), 52 deletions(-)
arch/arm/include/asm/arch-rockchip/bootrom.h +2 -0
index ecf3b4e7428c..e736772fda75 100644
@@ -7,6 +7,8 @@
 #ifndef _ASM_ARCH_BOOTROM_H
 #define _ASM_ARCH_BOOTROM_H
 
+#include <linux/types.h>
+
 /*
  * Saved Stack pointer address.
  * Access might be needed in some special cases.
arch/arm/include/asm/arch-rockchip/clock.h +2 -0
index f01c5aeb71cb..73e5283108b1 100644
@@ -6,6 +6,8 @@
 #ifndef _ASM_ARCH_CLOCK_H
 #define _ASM_ARCH_CLOCK_H
 
+#include <linux/types.h>
+
 struct udevice;
 
 /* define pll mode */
arch/arm/mach-rockchip/board.c +1 -1
index cd226844b638..8a57b8217ff2 100644
@@ -8,7 +8,7 @@
  * Based on puma-rk3399.c:
  *      (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
  */
-#include <common.h>
+#include <config.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <env.h>
arch/arm/mach-rockchip/boot_mode.c +0 -1
index f9be396aa558..55e9456668ae 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <adc.h>
 #include <command.h>
 #include <env.h>
arch/arm/mach-rockchip/bootrom.c +0 -1
index b36e559e8719..82a0b3efef92 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2017 Google, Inc
  */
 
-#include <common.h>
 #include <hang.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/boot_mode.h>
arch/arm/mach-rockchip/cpu-info.c +0 -1
index a62ff53c6a04..14c7331e1ab2 100644
@@ -4,7 +4,6 @@
  * Author: Jagan Teki <[email protected]>
  */
 
-#include <common.h>
 #include <env.h>
 #include <init.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/px30-board-tpl.c +0 -1
index db368a7b8c23..f0b3c5f83f47 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <init.h>
arch/arm/mach-rockchip/px30/clk_px30.c +0 -1
index 7edf1321feb3..410134769f8c 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2017 Rockchip Electronics Co., Ltd.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/px30/px30.c +0 -1
index 2ec3289d75b7..8b1509e55f21 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (c) 2017 Rockchip Electronics Co., Ltd
  */
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <fdt_support.h>
arch/arm/mach-rockchip/px30/syscon_px30.c +0 -1
index 37e88f5ccb91..c9de57493d8c 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2017 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
arch/arm/mach-rockchip/rk3036-board-spl.c +0 -1
index 73f6d241a1ce..64e100172fac 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2015-2019 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <debug_uart.h>
 #include <init.h>
 #include <asm/io.h>
arch/arm/mach-rockchip/rk3036/clk_rk3036.c +0 -1
index 116dccd7b87a..9046601a75e8 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3036/rk3036.c +0 -1
index e8130abdd777..6c92b31dc846 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/arch-rockchip/grf_rk3036.h>
arch/arm/mach-rockchip/rk3036/sdram_rk3036.c +1 -1
index 07cd29a33e69..308b9e6b8a8a 100644
@@ -2,7 +2,7 @@
 /*
  * (C) Copyright 2015 Rockchip Electronics Co., Ltd
  */
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <asm/types.h>
 #include <asm/arch-rockchip/cru_rk3036.h>
arch/arm/mach-rockchip/rk3036/syscon_rk3036.c +0 -1
index c2fd16079902..23b75269d507 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2015 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3066/clk_rk3066.c +0 -1
index c47526dca5de..88057fad0501 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3066/rk3066.c +0 -1
index 9a95ff850417..70b55ca8abf6 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/grf_rk3066.h>
 #include <asm/arch-rockchip/hardware.h>
arch/arm/mach-rockchip/rk3066/syscon_rk3066.c +0 -1
index a598f6400de3..ff269b53b542 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
arch/arm/mach-rockchip/rk3128/clk_rk3128.c +0 -1
index a1b038c64866..ae552af3ff59 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2017 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3128/syscon_rk3128.c +0 -1
index 1406d5d0d325..f81c57a48bee 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2017 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3188/clk_rk3188.c +0 -1
index 94d1d23e1f45..c0e71c3fa906 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3188/rk3188.c +0 -1
index ffdcaa49a1e5..53b2eaa2d534 100644
@@ -2,7 +2,6 @@
 /*
  * (C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
-#include <common.h>
 #include <dm.h>
 #include <hang.h>
 #include <init.h>
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +0 -1
index 917ff37c0fc1..6df054e5b27d 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
arch/arm/mach-rockchip/rk322x/clk_rk322x.c +0 -1
index 2e57672b246d..4703125392eb 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2017 Rockchip Electronics Co., Ltd.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk322x/syscon_rk322x.c +0 -1
index 0d9dca8173cd..c471a4c9fb74 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2017 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3288/clk_rk3288.c +0 -1
index fb4c0891d0dc..af6c5d1f59b2 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3288/rk3288.c +0 -1
index 70cf50029121..d1170f7e23d0 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (c) 2016 Rockchip Electronics Co., Ltd
  */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>
arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +0 -1
index 8b2c2f323a71..6413d0a88a16 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <log.h>
arch/arm/mach-rockchip/rk3308/clk_rk3308.c +0 -1
index 201bf661f9bb..557e21f8199e 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3308/rk3308.c +0 -1
index a0915c72bfa0..6f88638d1569 100644
@@ -2,7 +2,6 @@
 /*
  *Copyright (c) 2018 Rockchip Electronics Co., Ltd
  */
-#include <common.h>
 #include <init.h>
 #include <malloc.h>
 #include <asm/arch-rockchip/bootrom.h>
arch/arm/mach-rockchip/rk3308/syscon_rk3308.c +0 -1
index b380ff572336..2d7e97110152 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2018 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3328/clk_rk3328.c +0 -1
index 70c0eb6f98e7..b0c5af53da68 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2017 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru_rk3328.h>
arch/arm/mach-rockchip/rk3328/rk3328.c +0 -1
index ca3fa81e1278..c86d11943d6d 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/hardware.h>
arch/arm/mach-rockchip/rk3328/syscon_rk3328.c +0 -1
index d2f267e63534..02ed366d8b6f 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <asm/arch-rockchip/clock.h>
 #include <dm.h>
 #include <syscon.h>
arch/arm/mach-rockchip/rk3368/clk_rk3368.c +0 -1
index b075319720d9..c4d41e52af08 100644
@@ -4,7 +4,6 @@
  * Author: Andy Yan <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3368/rk3368.c +0 -1
index 8f5ca1dfa7c9..f589bf67328d 100644
@@ -4,7 +4,6 @@
  * Copyright (c) 2016 Andreas Färber
  */
 
-#include <common.h>
 #include <init.h>
 #include <syscon.h>
 #include <asm/armv8/mmu.h>
arch/arm/mach-rockchip/rk3368/syscon_rk3368.c +0 -1
index dc2d831dd84f..7389c0283641 100644
@@ -5,7 +5,6 @@
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
arch/arm/mach-rockchip/rk3399/clk_rk3399.c +0 -1
index 9d9a837fc748..de552b5903b5 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3399/rk3399.c +0 -1
index 7fa1d7c7b7af..2d7d0f82a2f1 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-rockchip/rk3399/syscon_rk3399.c +0 -1
index 2b5746cb31bb..b92ad54ede5c 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
arch/arm/mach-rockchip/rk3568/clk_rk3568.c +0 -1
index 8917edcbd304..1c6b2ece602b 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2021 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3568/rk3568.c +0 -1
index b30ea04f737a..1b3e40074e3b 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2021 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/armv8/mmu.h>
 #include <asm/arch-rockchip/bootrom.h>
arch/arm/mach-rockchip/rk3568/syscon_rk3568.c +0 -1
index 5407e7827f52..255259eabfda 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2021 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3588/clk_rk3588.c +0 -1
index 3df0bf223e30..250ec423bd24 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2020 Rockchip Electronics Co., Ltd.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rk3588/rk3588.c +0 -1
index eb65dafe3a24..d3162d3447e0 100644
@@ -4,7 +4,6 @@
  * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
  */
 
-#include <common.h>
 #include <spl.h>
 #include <asm/armv8/mmu.h>
 #include <asm/arch-rockchip/bootrom.h>
arch/arm/mach-rockchip/rk3588/syscon_rk3588.c +0 -1
index 7b2cf37d9da1..f86567fcaf4f 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2021 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rv1108/clk_rv1108.c +0 -1
index 44b53c407a78..5659ae03d711 100644
@@ -4,7 +4,6 @@
  * Author: Andy Yan <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rv1108/syscon_rv1108.c +0 -1
index babdf5720b24..d68fbf1bd251 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2016 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rv1126/clk_rv1126.c +0 -1
index bd8902718f20..3d64fcd45949 100644
@@ -4,7 +4,6 @@
  * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
arch/arm/mach-rockchip/rv1126/rv1126.c +0 -1
index 40eb9eb7b196..1c10e9b9f233 100644
@@ -4,7 +4,6 @@
  * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
  */
 
-#include <common.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rv1126.h>
arch/arm/mach-rockchip/rv1126/syscon_rv1126.c +0 -1
index 599ea66e3d67..67d2f18a8d0f 100644
@@ -4,7 +4,6 @@
  * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
arch/arm/mach-rockchip/sdram.c +1 -1
index f2a3d6b14001..1fb01e1c4b13 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Rockchip Electronics Co., Ltd.
  */
 
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-rockchip/spl-boot-order.c +0 -1
index 3543267aa574..3dce9b30898d 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH
  */
 
-#include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <log.h>
arch/arm/mach-rockchip/tpl.c +0 -1
index 2c3e9789cc89..50f04f9474a0 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <debug_uart.h>
 #include <dm.h>
Signature · 1 line
2.34.1
author
#12 lore raw

PATCH 11/33 arm: owl: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-owl files and when needed add missing include files directly.

---
Cc: Manivannan Sadhasivam <[email protected]>

---
 arch/arm/mach-owl/soc.c        | 3 ++-
 arch/arm/mach-owl/sysmap-owl.c | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-owl/soc.c +2 -1
index f0f46f2dcb74..e6332452e3ee 100644
@@ -5,13 +5,14 @@
  * Copyright (C) 2018 Manivannan Sadhasivam <[email protected]>
  */
 
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <linux/arm-smccc.h>
 #include <linux/psci.h>
-#include <common.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/psci.h>
arch/arm/mach-owl/sysmap-owl.c +0 -1
index 81f6ca2e4919..6f0a220320e4 100644
@@ -6,7 +6,6 @@
  * Copyright (C) 2018 Manivannan Sadhasivam <[email protected]>
  */
 
-#include <common.h>
 #include <asm/armv8/mmu.h>
 
 static struct mm_region owl_mem_map[] = {
Signature · 1 line
2.34.1
author
#13 lore raw

PATCH 12/33 arm: orion5x: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-orion5x files and when needed add missing include files directly.

---
 arch/arm/mach-orion5x/cpu.c   | 1 -
 arch/arm/mach-orion5x/dram.c  | 1 -
 arch/arm/mach-orion5x/timer.c | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)
arch/arm/mach-orion5x/cpu.c +0 -1
index ffae9a01e37c..58ee67eca50f 100644
@@ -8,7 +8,6 @@
  * Written-by: Prafulla Wadaskar <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
arch/arm/mach-orion5x/dram.c +0 -1
index 5647f847d78f..228a3f7ad075 100644
@@ -8,7 +8,6 @@
  * Written-by: Prafulla Wadaskar <[email protected]>
  */
 
-#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-orion5x/timer.c +1 -1
index b373e59e6fe3..85736f04e672 100644
@@ -7,7 +7,7 @@
  * Written-by: Prafulla Wadaskar <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
Signature · 1 line
2.34.1
author
#14 lore raw

PATCH 13/33 arm: omap2: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-omap2 files and when needed add missing include files directly.

---
 arch/arm/include/asm/arch-am33xx/clk_synthesizer.h | 2 ++
 arch/arm/mach-omap2/abb.c                          | 1 -
 arch/arm/mach-omap2/am33xx/board.c                 | 2 +-
 arch/arm/mach-omap2/am33xx/chilisom.c              | 1 -
 arch/arm/mach-omap2/am33xx/clk_synthesizer.c       | 3 +--
 arch/arm/mach-omap2/am33xx/clock.c                 | 1 -
 arch/arm/mach-omap2/am33xx/clock_am33xx.c          | 1 -
 arch/arm/mach-omap2/am33xx/clock_am43xx.c          | 1 -
 arch/arm/mach-omap2/am33xx/ddr.c                   | 2 +-
 arch/arm/mach-omap2/am33xx/emif4.c                 | 1 -
 arch/arm/mach-omap2/am33xx/fdt.c                   | 1 -
 arch/arm/mach-omap2/am33xx/mux.c                   | 1 -
 arch/arm/mach-omap2/am33xx/sys_info.c              | 1 -
 arch/arm/mach-omap2/boot-common.c                  | 1 -
 arch/arm/mach-omap2/clocks-common.c                | 1 -
 arch/arm/mach-omap2/emif-common.c                  | 2 +-
 arch/arm/mach-omap2/fdt-common.c                   | 2 +-
 arch/arm/mach-omap2/hwinit-common.c                | 1 -
 arch/arm/mach-omap2/mem-common.c                   | 2 +-
 arch/arm/mach-omap2/omap-cache.c                   | 3 ++-
 arch/arm/mach-omap2/omap3/am35x_musb.c             | 2 +-
 arch/arm/mach-omap2/omap3/board.c                  | 1 -
 arch/arm/mach-omap2/omap3/boot.c                   | 1 -
 arch/arm/mach-omap2/omap3/clock.c                  | 3 ++-
 arch/arm/mach-omap2/omap3/emac.c                   | 1 -
 arch/arm/mach-omap2/omap3/emif4.c                  | 3 ++-
 arch/arm/mach-omap2/omap3/sdrc.c                   | 2 +-
 arch/arm/mach-omap2/omap3/spl_id_nand.c            | 1 -
 arch/arm/mach-omap2/omap3/sys_info.c               | 3 ++-
 arch/arm/mach-omap2/omap4/boot.c                   | 1 -
 arch/arm/mach-omap2/omap4/emif.c                   | 1 -
 arch/arm/mach-omap2/omap4/hw_data.c                | 1 -
 arch/arm/mach-omap2/omap4/hwinit.c                 | 1 -
 arch/arm/mach-omap2/omap4/sdram_elpida.c           | 1 -
 arch/arm/mach-omap2/omap5/abb.c                    | 2 +-
 arch/arm/mach-omap2/omap5/boot.c                   | 1 -
 arch/arm/mach-omap2/omap5/dra7xx_iodelay.c         | 2 +-
 arch/arm/mach-omap2/omap5/emif.c                   | 1 -
 arch/arm/mach-omap2/omap5/fdt.c                    | 2 +-
 arch/arm/mach-omap2/omap5/hw_data.c                | 1 -
 arch/arm/mach-omap2/omap5/hwinit.c                 | 1 -
 arch/arm/mach-omap2/omap5/sdram.c                  | 1 -
 arch/arm/mach-omap2/sec-common.c                   | 2 +-
 arch/arm/mach-omap2/timer.c                        | 2 +-
 arch/arm/mach-omap2/utils.c                        | 2 +-
 arch/arm/mach-omap2/vc.c                           | 2 +-
 46 files changed, 25 insertions(+), 46 deletions(-)
arch/arm/include/asm/arch-am33xx/clk_synthesizer.h +2 -0
index 8e3d55f3e763..393bc7a6a8a5 100644
@@ -10,6 +10,8 @@
 #ifndef __CLK_SYNTHESIZER_H
 #define __CLK_SYNTHESIZER_H
 
+#include <linux/types.h>
+
 #define CLK_SYNTHESIZER_ID_REG		0x0
 #define CLK_SYNTHESIZER_XCSEL		0x05
 #define CLK_SYNTHESIZER_MUX_REG		0x14
arch/arm/mach-omap2/abb.c +0 -1
index 722e6db0566d..ce33d2fe1297 100644
@@ -8,7 +8,6 @@
  * Andrii Tseglytskyi <[email protected]>
  */
 
-#include <common.h>
 #include <asm/omap_common.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
arch/arm/mach-omap2/am33xx/board.c +1 -1
index 09659da5867d..78c1e965c9f5 100644
@@ -7,7 +7,7 @@
  * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/
  */
 
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <debug_uart.h>
 #include <errno.h>
arch/arm/mach-omap2/am33xx/chilisom.c +0 -1
index d4f2abe17a97..4765ce0adeea 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2017, Grinn - http://grinn-global.com/
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk_synthesizer.h>
arch/arm/mach-omap2/am33xx/clk_synthesizer.c +1 -2
index 0969a404bf69..b75eb58ee827 100644
@@ -7,8 +7,7 @@
  * Copyright (C) 2016, Texas Instruments, Incorporated - https://www.ti.com/
  */
 
-
-#include <common.h>
+#include <stdio.h>
 #include <asm/arch/clk_synthesizer.h>
 #include <i2c.h>
 
arch/arm/mach-omap2/am33xx/clock.c +0 -1
index 3273632c648d..f07003c95bc2 100644
@@ -7,7 +7,6 @@
  *
  * Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/
  */
-#include <common.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-omap2/am33xx/clock_am33xx.c +0 -1
index d39e7e4fed13..c33d974dccdd 100644
@@ -7,7 +7,6 @@
  * Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/
  */
 
-#include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
arch/arm/mach-omap2/am33xx/clock_am43xx.c +0 -1
index 8039bc2fe751..abd65ffd77fc 100644
@@ -8,7 +8,6 @@
  * Copyright (C) 2013, Texas Instruments, Incorporated - https://www.ti.com/
  */
 
-#include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-omap2/am33xx/ddr.c +1 -1
index 61b95c937338..41eec005cb1b 100644
@@ -5,7 +5,7 @@
  * Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com/
  */
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/ddr_defs.h>
arch/arm/mach-omap2/am33xx/emif4.c +0 -1
index b29250b8d207..f19c66822d20 100644
@@ -7,7 +7,6 @@
  * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/
  */
 
-#include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/ddr_defs.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-omap2/am33xx/fdt.c +0 -1
index 2ec30b1f9c38..3e81616cb746 100644
@@ -3,7 +3,6 @@
  * Copyright 2017 Texas Instruments, Inc.
  */
 
-#include <common.h>
 #include <hang.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
arch/arm/mach-omap2/am33xx/mux.c +0 -1
index 496055939798..06b08e89e7fb 100644
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <common.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
arch/arm/mach-omap2/am33xx/sys_info.c +0 -1
index 390d540e85a0..87afc096602d 100644
@@ -11,7 +11,6 @@
  *      Syed Mohammed Khasim <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-omap2/boot-common.c +0 -1
index aa0ab13d5fb1..e1ea3515ac10 100644
@@ -7,7 +7,6 @@
  * Copyright (C) 2011, Texas Instruments, Incorporated - https://www.ti.com/
  */
 
-#include <common.h>
 #include <ahci.h>
 #include <log.h>
 #include <dm/uclass.h>
arch/arm/mach-omap2/clocks-common.c +0 -1
index 390d1f2a649b..2a0c22841d03 100644
@@ -12,7 +12,6 @@
  *	Santosh Shilimkar <[email protected]>
  *	Rajendra Nayak <[email protected]>
  */
-#include <common.h>
 #include <hang.h>
 #include <i2c.h>
 #include <init.h>
arch/arm/mach-omap2/emif-common.c +1 -1
index 9daaeef73190..4d431e20779d 100644
@@ -8,7 +8,7 @@
  * Aneesh V <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-omap2/fdt-common.c +1 -1
index e90d5776703d..c6b4c03b5085 100644
@@ -3,7 +3,7 @@
  * Copyright 2016-2017 Texas Instruments, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
arch/arm/mach-omap2/hwinit-common.c +0 -1
index 0e4572ca41a7..138501602c35 100644
@@ -10,7 +10,6 @@
  *	Aneesh V	<[email protected]>
  *	Steve Sakoman	<[email protected]>
  */
-#include <common.h>
 #include <debug_uart.h>
 #include <event.h>
 #include <fdtdec.h>
arch/arm/mach-omap2/mem-common.c +1 -1
index 19197482aa42..00f144eb747b 100644
@@ -12,7 +12,7 @@
  *     Syed Mohammed Khasim <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #if IS_ENABLED(CONFIG_TARGET_AM335X_GUARDIAN)
arch/arm/mach-omap2/omap-cache.c +2 -1
index 36db58824339..132b205220ca 100644
@@ -11,11 +11,12 @@
  *	Steve Sakoman	<[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <linux/string.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-omap2/omap3/am35x_musb.c +1 -1
index 1121acc00589..d3807623bc64 100644
@@ -8,8 +8,8 @@
  * Hema HK <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
+#include <time.h>
 #include <dm/device.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
arch/arm/mach-omap2/omap3/board.c +0 -1
index c76a95dd5d09..c5ada607f978 100644
@@ -15,7 +15,6 @@
  *      Syed Mohammed Khasim <[email protected]>
  *
  */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <init.h>
arch/arm/mach-omap2/omap3/boot.c +0 -1
index ea26115b7118..2a36a25e2799 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2015 Paul Kocialkowski <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <spl.h>
arch/arm/mach-omap2/omap3/clock.c +2 -1
index 13685e0567af..417d1eb846f3 100644
@@ -11,11 +11,12 @@
  *      Syed Mohammed Khasim <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clocks_omap3.h>
 #include <asm/arch/mem.h>
+#include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <command.h>
 
arch/arm/mach-omap2/omap3/emac.c +0 -1
index d0d0b7a75a61..7348e92cabdf 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2011, Ilya Yanok, Emcraft Systems
  */
 
-#include <common.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/am35x_def.h>
arch/arm/mach-omap2/omap3/emif4.c +2 -1
index 4fbfb387ab08..79960bf46f8b 100644
@@ -9,9 +9,10 @@
  * Texas Instruments Incorporated - https://www.ti.com/
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-omap2/omap3/sdrc.c +1 -1
index 4d27d82c7881..f08e4b3af5e2 100644
@@ -21,9 +21,9 @@
  *      Manikandan Pillai <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-omap2/omap3/spl_id_nand.c +0 -1
index 84a0b0ade931..d4712629d9de 100644
@@ -11,7 +11,6 @@
  *     Jian Zhang <[email protected]>
  */
 
-#include <common.h>
 #include <jffs2/load_kernel.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/mtd/omap_gpmc.h>
arch/arm/mach-omap2/omap3/sys_info.c +2 -1
index 5f535e278277..1e3fcd597968 100644
@@ -11,9 +11,10 @@
  *      Syed Mohammed Khasim <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/mem.h>	/* get mem tables */
+#include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/bootm.h>
 #include <asm/omap_common.h>
arch/arm/mach-omap2/omap4/boot.c +0 -1
index 90b5380ae398..a60249f7fd62 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2015 Paul Kocialkowski <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-omap2/omap4/emif.c +0 -1
index 35a51645be7f..5b0d3b5c78a0 100644
@@ -8,7 +8,6 @@
  * Aneesh V <[email protected]>
  */
 
-#include <common.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/utils.h>
arch/arm/mach-omap2/omap4/hw_data.c +0 -1
index d587a4d4def0..a81d76554949 100644
@@ -8,7 +8,6 @@
  *
  * Sricharan R <[email protected]>
  */
-#include <common.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
arch/arm/mach-omap2/omap4/hwinit.c +0 -1
index 27dfa9142dcd..e3e6cc8e5785 100644
@@ -10,7 +10,6 @@
  *	Aneesh V	<[email protected]>
  *	Steve Sakoman	<[email protected]>
  */
-#include <common.h>
 #include <palmas.h>
 #include <asm/armv7.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-omap2/omap4/sdram_elpida.c +0 -1
index 2a18cf0215d9..a29a264016ed 100644
@@ -9,7 +9,6 @@
  * Aneesh V <[email protected]>
  */
 
-#include <common.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
 
arch/arm/mach-omap2/omap5/abb.c +1 -1
index 2f9f8e65d03e..21da0b11661d 100644
@@ -8,7 +8,7 @@
  * Andrii Tseglytskyi <[email protected]>
  */
 
-#include <common.h>
+#include <asm/arch/omap.h>
 #include <asm/omap_common.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
arch/arm/mach-omap2/omap5/boot.c +0 -1
index 15d6836c6eae..5b479a87516b 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2015 Paul Kocialkowski <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/omap_common.h>
 #include <spl.h>
arch/arm/mach-omap2/omap5/dra7xx_iodelay.c +1 -1
index 8569eff31ab5..d50452b5a30b 100644
@@ -6,7 +6,7 @@
  * Lokesh Vutla <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <hang.h>
 #include <log.h>
 #include <asm/utils.h>
arch/arm/mach-omap2/omap5/emif.c +0 -1
index 2de36b6feca6..d243ff3bd8f0 100644
@@ -8,7 +8,6 @@
  * Aneesh V <[email protected]> for OMAP4
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-omap2/omap5/fdt.c +1 -1
index 0ca02e664c4b..f75ec47d8210 100644
@@ -3,7 +3,7 @@
  * Copyright 2016 Texas Instruments, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <hang.h>
 #include <log.h>
 #include <linux/libfdt.h>
arch/arm/mach-omap2/omap5/hw_data.c +0 -1
index b39132222ee5..e65727026eff 100644
@@ -8,7 +8,6 @@
  *
  * Sricharan R <[email protected]>
  */
-#include <common.h>
 #include <palmas.h>
 #include <asm/arch/omap.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-omap2/omap5/hwinit.c +0 -1
index edab9a92982e..7f41e85c4a67 100644
@@ -11,7 +11,6 @@
  *	Steve Sakoman	<[email protected]>
  *	Sricharan	<[email protected]>
  */
-#include <common.h>
 #include <cpu_func.h>
 #include <palmas.h>
 #include <asm/armv7.h>
arch/arm/mach-omap2/omap5/sdram.c +0 -1
index 786da45fac83..6bf4cf4a7582 100644
@@ -10,7 +10,6 @@
  * Sricharan R <[email protected]>
  */
 
-#include <common.h>
 #include <asm/emif.h>
 #include <asm/arch/sys_proto.h>
 
arch/arm/mach-omap2/sec-common.c +1 -1
index 64560b21e3f5..16bbc93f4a35 100644
@@ -12,7 +12,7 @@
  * Andrew F. Davis <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <hang.h>
arch/arm/mach-omap2/timer.c +1 -1
index 71fdf5bf487c..ed0620e7b63f 100644
@@ -15,7 +15,7 @@
  * Gary Jennejohn, DENX Software Engineering, <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/mach-omap2/utils.c +1 -1
index 0623281a3c7d..2326d153b12f 100644
@@ -3,9 +3,9 @@
  * Copyright 2011 Linaro Limited
  * Aneesh V <[email protected]>
  */
-#include <common.h>
 #include <env.h>
 #include <part.h>
+#include <vsprintf.h>
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/omap_common.h>
arch/arm/mach-omap2/vc.c +1 -1
index 054782efbdbd..cb377aa12723 100644
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/omap_common.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clock.h>
Signature · 1 line
2.34.1
author
#15 lore raw

PATCH 14/33 arm: octeontx2: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-octeontx2 files and when needed add missing include files directly.

---
 arch/arm/mach-octeontx2/clock.c | 1 -
 arch/arm/mach-octeontx2/cpu.c   | 1 -
 2 files changed, 2 deletions(-)
arch/arm/mach-octeontx2/clock.c +0 -1
index 9da21077ecdc..ffdee8799fb6 100644
@@ -5,7 +5,6 @@
  * https://spdx.org/licenses
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/board.h>
 #include <asm/arch/clock.h>
arch/arm/mach-octeontx2/cpu.c +0 -1
index 723deef719b6..0a44af71a40d 100644
@@ -5,7 +5,6 @@
  * https://spdx.org/licenses
  */
 
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
Signature · 1 line
2.34.1
author
#16 lore raw

PATCH 15/33 arm: octeontx: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-octeontx files and when needed add missing include files directly.

---
 arch/arm/mach-octeontx/clock.c | 1 -
 arch/arm/mach-octeontx/cpu.c   | 1 -
 2 files changed, 2 deletions(-)
arch/arm/mach-octeontx/clock.c +0 -1
index 9da21077ecdc..ffdee8799fb6 100644
@@ -5,7 +5,6 @@
  * https://spdx.org/licenses
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/board.h>
 #include <asm/arch/clock.h>
arch/arm/mach-octeontx/cpu.c +0 -1
index aa5f4585c6f5..90454edca257 100644
@@ -5,7 +5,6 @@
  * https://spdx.org/licenses
  */
 
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
Signature · 1 line
2.34.1
author
#17 lore raw

PATCH 16/33 arm: npcm: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-npcm files and when needed add missing include files directly.

---
Cc: Jim Liu <[email protected]>

---
 arch/arm/mach-npcm/npcm7xx/cpu.c            | 1 -
 arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c | 2 +-
 arch/arm/mach-npcm/npcm8xx/cpu.c            | 1 -
 arch/arm/mach-npcm/npcm8xx/reset.c          | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)
arch/arm/mach-npcm/npcm7xx/cpu.c +0 -1
index dd74bb9e0871..47d51cab5c76 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2021 Nuvoton Technology Corp.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
arch/arm/mach-npcm/npcm7xx/l2_cache_pl310.c +1 -1
index ed4b1ca5c983..df80687c8571 100644
@@ -3,7 +3,7 @@
  * Copyright (c) 2021 Nuvoton Technology Corp.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
 
arch/arm/mach-npcm/npcm8xx/cpu.c +0 -1
index af594526094c..a1fb400b2645 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2022 Nuvoton Technology Corp.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
arch/arm/mach-npcm/npcm8xx/reset.c +0 -1
index 6954e6c6a17f..e28b4ae7ae4b 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2022 Nuvoton Technology Corp.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/gcr.h>
 #include <asm/arch/rst.h>
Signature · 1 line
2.34.1
author
#18 lore raw

PATCH 17/33 arm: nexell: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-nexell files and when needed add missing include files directly.

---
Cc: Stefan Bosch <[email protected]>

---
 arch/arm/mach-nexell/clock.c              | 2 +-
 arch/arm/mach-nexell/include/mach/reset.h | 2 ++
 arch/arm/mach-nexell/reset.c              | 1 -
 arch/arm/mach-nexell/tieoff.c             | 1 -
 arch/arm/mach-nexell/timer.c              | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/mach-nexell/clock.c +1 -1
index 59ffa26255f5..3082f6077b73 100644
@@ -4,8 +4,8 @@
  * Hyunseok, Jung <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 #include <linux/err.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
arch/arm/mach-nexell/include/mach/reset.h +2 -0
index e1301d4e53d3..0c6a13043f91 100644
@@ -7,6 +7,8 @@
 #ifndef __NEXELL_RESET__
 #define __NEXELL_RESET__
 
+#include <linux/types.h>
+
 #define NUMBER_OF_RESET_MODULE_PIN      69
 
 enum rstcon {
arch/arm/mach-nexell/reset.c +0 -1
index 1f732a3d3732..627f568270b6 100644
@@ -8,7 +8,6 @@
  *FIXME : Not support device tree & reset control driver.
  *        will remove after support device tree & reset control driver.
  */
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
arch/arm/mach-nexell/tieoff.c +0 -1
index 5a4744c296a2..51cca6744d6f 100644
@@ -4,7 +4,6 @@
  * Youngbok, Park <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/reset.h>
arch/arm/mach-nexell/timer.c +0 -1
index 3b311fd22a56..b35c7b1bb33a 100644
@@ -4,7 +4,6 @@
  * Hyunseok, Jung <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 
 #include <asm/io.h>
Signature · 1 line
2.34.1
Reviewed-by Tested-by on v1 17/33
#19 lore raw

Re: [PATCH 17/33] arm: nexell: Remove <common.h> and add needed includes

Quoted 4 lines · Tom Rini

Remove <common.h> from all mach-nexell files and when needed add missing include files directly.

Looks good, tested on FriendlyElec-Board NanoPC-T2.

Thanks a lot!

Quoted 73 lines

---
Cc: Stefan Bosch <[email protected]>

---
  arch/arm/mach-nexell/clock.c              | 2 +-
  arch/arm/mach-nexell/include/mach/reset.h | 2 ++
  arch/arm/mach-nexell/reset.c              | 1 -
  arch/arm/mach-nexell/tieoff.c             | 1 -
  arch/arm/mach-nexell/timer.c              | 1 -
  5 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/mach-nexell/clock.c +1 -1
index 59ffa26255f5..3082f6077b73 100644
@@ -4,8 +4,8 @@
   * Hyunseok, Jung <[email protected]>
   */
 
-#include <common.h>
  #include <command.h>
+#include <vsprintf.h>
  #include <linux/err.h>
  #include <asm/io.h>
  #include <asm/arch/nexell.h>
arch/arm/mach-nexell/include/mach/reset.h +2 -0
index e1301d4e53d3..0c6a13043f91 100644
@@ -7,6 +7,8 @@
  #ifndef __NEXELL_RESET__
  #define __NEXELL_RESET__
 
+#include <linux/types.h>
+
  #define NUMBER_OF_RESET_MODULE_PIN      69
 
  enum rstcon {
arch/arm/mach-nexell/reset.c +0 -1
index 1f732a3d3732..627f568270b6 100644
@@ -8,7 +8,6 @@
   *FIXME : Not support device tree & reset control driver.
   *        will remove after support device tree & reset control driver.
   */
-#include <common.h>
  #include <asm/io.h>
  #include <asm/arch/nexell.h>
  #include <asm/arch/reset.h>
arch/arm/mach-nexell/tieoff.c +0 -1
index 5a4744c296a2..51cca6744d6f 100644
@@ -4,7 +4,6 @@
   * Youngbok, Park <[email protected]>
   */
 
-#include <common.h>
  #include <asm/arch/nexell.h>
  #include <asm/arch/clk.h>
  #include <asm/arch/reset.h>
arch/arm/mach-nexell/timer.c +0 -1
index 3b311fd22a56..b35c7b1bb33a 100644
@@ -4,7 +4,6 @@
   * Hyunseok, Jung <[email protected]>
   */
 
-#include <common.h>
  #include <log.h>
 
  #include <asm/io.h>
author
#20 lore raw

PATCH 18/33 arm: mvebu: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-mvebu files and when needed add missing include files directly.

---
Cc: Stefan Roese <[email protected]>
Cc: "Marek Behún" <[email protected]>

---
 arch/arm/mach-mvebu/alleycat5/cpu.c                       | 2 +-
 arch/arm/mach-mvebu/alleycat5/soc.c                       | 1 -
 arch/arm/mach-mvebu/arm64-common.c                        | 2 +-
 arch/arm/mach-mvebu/armada3700/cpu.c                      | 1 -
 arch/arm/mach-mvebu/armada3700/efuse.c                    | 3 ++-
 arch/arm/mach-mvebu/armada3700/mbox.c                     | 2 +-
 arch/arm/mach-mvebu/armada8k/cpu.c                        | 1 -
 arch/arm/mach-mvebu/armada8k/dram.c                       | 3 ++-
 arch/arm/mach-mvebu/cpu.c                                 | 2 +-
 arch/arm/mach-mvebu/dram.c                                | 2 +-
 arch/arm/mach-mvebu/efuse.c                               | 1 -
 arch/arm/mach-mvebu/gpio.c                                | 1 -
 arch/arm/mach-mvebu/mbus.c                                | 2 +-
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c | 1 -
 arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c     | 2 +-
 arch/arm/mach-mvebu/serdes/a38x/seq_exec.c                | 1 -
 arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c             | 1 -
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c       | 2 +-
 arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c      | 1 -
 arch/arm/mach-mvebu/spl.c                                 | 1 -
 arch/arm/mach-mvebu/system-controller.c                   | 1 -
 21 files changed, 12 insertions(+), 21 deletions(-)
arch/arm/mach-mvebu/alleycat5/cpu.c +1 -1
index 0f72ae1709be..be2d9a25bf90 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Marvell International Ltd.
  */
 
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <linux/libfdt.h>
arch/arm/mach-mvebu/alleycat5/soc.c +0 -1
index 734b0a87dd49..98e66735eb9e 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018 Marvell International Ltd.
  */
 
-#include <common.h>
 #include <asm/arch-armada8k/cache_llc.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-mvebu/arm64-common.c +1 -1
index 4c67f1aba4de..63a12f7d7743 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
arch/arm/mach-mvebu/armada3700/cpu.c +0 -1
index ab72b304e5da..17525691e682 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2020 Marek Behún <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdtdec.h>
arch/arm/mach-mvebu/armada3700/efuse.c +2 -1
index 07d5f394354c..84a1e388c11b 100644
@@ -5,9 +5,10 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/types.h>
 #include <mach/mbox.h>
 #include <mach/soc.h>
 
arch/arm/mach-mvebu/armada3700/mbox.c +1 -1
index 6555b8673ce0..5ac543abce5b 100644
@@ -4,11 +4,11 @@
  * Copyright (C) 2021 Pali Rohár <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
+#include <linux/errno.h>
 #include <mach/mbox.h>
 
 #define RWTM_BASE		(MVEBU_REGISTER(0xb0000))
arch/arm/mach-mvebu/armada8k/cpu.c +0 -1
index 939abce000f6..7908f75809c5 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdtdec.h>
arch/arm/mach-mvebu/armada8k/dram.c +2 -1
index 6c801bfa1db7..8a87e4a8e035 100644
@@ -3,10 +3,11 @@
  * Copyright (C) 2016 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <linux/sizes.h>
arch/arm/mach-mvebu/cpu.c +1 -1
index 7c62a5dbb6a0..e603ab9ffb75 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2014-2016 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <ahci.h>
 #include <cpu_func.h>
 #include <init.h>
arch/arm/mach-mvebu/dram.c +1 -1
index d398d0f7676a..daf2f8e3f671 100644
@@ -6,9 +6,9 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
arch/arm/mach-mvebu/efuse.c +0 -1
index be5dc0e07d9b..475687955e05 100644
@@ -4,7 +4,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <errno.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-mvebu/gpio.c +0 -1
index 1d1e3df8ba90..587cbb00e7fc 100644
@@ -5,7 +5,6 @@
  * Written-by: Prafulla Wadaskar <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
arch/arm/mach-mvebu/mbus.c +1 -1
index 959ca8e92602..9baeece3c850 100644
@@ -46,7 +46,7 @@
  *   mvebu_mbus_del_window().
  */
 
-#include <common.h>
+#include <config.h>
 #include <malloc.h>
 #include <linux/bitops.h>
 #include <linux/errno.h>
arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c +0 -1
index 12596ec2d8bd..4582871556d9 100644
@@ -3,7 +3,6 @@
  * Copyright (C) Marvell International Ltd. and its affiliates
  */
 
-#include <common.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c +1 -1
index 3349f4eb5491..efc31d5218ac 100644
@@ -3,7 +3,7 @@
  * Copyright (C) Marvell International Ltd. and its affiliates
  */
 
-#include <common.h>
+#include <config.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-mvebu/serdes/a38x/seq_exec.c +0 -1
index 2a51b7113ce4..9a1bbba7f2f4 100644
@@ -3,7 +3,6 @@
  * Copyright (C) Marvell International Ltd. and its affiliates
  */
 
-#include <common.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c +0 -1
index fb8ec11dfb95..8290b861c079 100644
@@ -3,7 +3,6 @@
  * Copyright (C) Marvell International Ltd. and its affiliates
  */
 
-#include <common.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c +1 -1
index 68f8eade2722..61b7f168697b 100644
@@ -3,7 +3,7 @@
  * Copyright (C) Marvell International Ltd. and its affiliates
  */
 
-#include <common.h>
+#include <config.h>
 #include <i2c.h>
 #include <spl.h>
 #include <asm/io.h>
arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c +0 -1
index 539d237623a1..9b7bb2c38511 100644
@@ -3,7 +3,6 @@
  * Copyright (C) Marvell International Ltd. and its affiliates
  */
 
-#include <common.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-mvebu/spl.c +0 -1
index 79f8877745b3..4f4f7e00e3cf 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014-2016 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdtdec.h>
arch/arm/mach-mvebu/system-controller.c +0 -1
index 682431ee11d9..d94bde0777c8 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2024 Marek Behún <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/lists.h>
 #include <regmap.h>
Signature · 1 line
2.34.1
author
#21 lore raw

PATCH 19/33 arm: meson: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-meson files and when needed add missing include files directly.

---
Cc: Neil Armstrong <[email protected]>
Cc: [email protected]

---
 arch/arm/mach-meson/board-a1.c     | 2 +-
 arch/arm/mach-meson/board-axg.c    | 1 -
 arch/arm/mach-meson/board-common.c | 1 -
 arch/arm/mach-meson/board-g12a.c   | 1 -
 arch/arm/mach-meson/board-gx.c     | 1 -
 arch/arm/mach-meson/board-info.c   | 1 -
 arch/arm/mach-meson/sm.c           | 1 -
 7 files changed, 1 insertion(+), 7 deletions(-)
arch/arm/mach-meson/board-a1.c +1 -1
index 967bb671822e..f848c0f068ed 100644
@@ -3,12 +3,12 @@
  * (C) Copyright 2023 SberDevices, Inc.
  */
 
-#include <common.h>
 #include <asm/arch/a1.h>
 #include <asm/arch/boot.h>
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 
 phys_size_t get_effective_memsize(void)
arch/arm/mach-meson/board-axg.c +0 -1
index fdf18752cdd0..6535539184cc 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2018 Neil Armstrong <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <net.h>
 #include <asm/arch/boot.h>
arch/arm/mach-meson/board-common.c +0 -1
index 7ceba7cede85..39774c43049a 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2016 Beniamino Galvani <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <fastboot.h>
 #include <init.h>
arch/arm/mach-meson/board-g12a.c +0 -1
index d5a830fb1db8..dc4abe1e1074 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2018 Neil Armstrong <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <log.h>
 #include <net.h>
arch/arm/mach-meson/board-gx.c +0 -1
index c3fbdfffeae8..0370ed57e205 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2018 Neil Armstrong <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <net.h>
 #include <asm/arch/boot.h>
arch/arm/mach-meson/board-info.c +0 -1
index d51d9b8f0645..b4058f593234 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2019 Neil Armstrong <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
arch/arm/mach-meson/sm.c +0 -1
index 914fd11c9894..4d9f83d3b38d 100644
@@ -5,7 +5,6 @@
  * Secure monitor calls.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <regmap.h>
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 19/33
#22 lore raw

Re: [PATCH 19/33] arm: meson: Remove <common.h> and add needed includes

Quoted 100 lines · Tom Rini

Remove <common.h> from all mach-meson files and when needed add missing include files directly.

---
Cc: Neil Armstrong <[email protected]>
Cc: [email protected]

---
  arch/arm/mach-meson/board-a1.c     | 2 +-
  arch/arm/mach-meson/board-axg.c    | 1 -
  arch/arm/mach-meson/board-common.c | 1 -
  arch/arm/mach-meson/board-g12a.c   | 1 -
  arch/arm/mach-meson/board-gx.c     | 1 -
  arch/arm/mach-meson/board-info.c   | 1 -
  arch/arm/mach-meson/sm.c           | 1 -
  7 files changed, 1 insertion(+), 7 deletions(-)
arch/arm/mach-meson/board-a1.c +1 -1
index 967bb671822e..f848c0f068ed 100644
@@ -3,12 +3,12 @@
   * (C) Copyright 2023 SberDevices, Inc.
   */
 
-#include <common.h>
  #include <asm/arch/a1.h>
  #include <asm/arch/boot.h>
  #include <asm/armv8/mmu.h>
  #include <asm/io.h>
  #include <linux/compiler.h>
+#include <linux/errno.h>
  #include <linux/sizes.h>
 
  phys_size_t get_effective_memsize(void)
arch/arm/mach-meson/board-axg.c +0 -1
index fdf18752cdd0..6535539184cc 100644
@@ -4,7 +4,6 @@
   * (C) Copyright 2018 Neil Armstrong <[email protected]>
   */
 
-#include <common.h>
  #include <init.h>
  #include <net.h>
  #include <asm/arch/boot.h>
arch/arm/mach-meson/board-common.c +0 -1
index 7ceba7cede85..39774c43049a 100644
@@ -3,7 +3,6 @@
   * (C) Copyright 2016 Beniamino Galvani <[email protected]>
   */
 
-#include <common.h>
  #include <cpu_func.h>
  #include <fastboot.h>
  #include <init.h>
arch/arm/mach-meson/board-g12a.c +0 -1
index d5a830fb1db8..dc4abe1e1074 100644
@@ -4,7 +4,6 @@
   * (C) Copyright 2018 Neil Armstrong <[email protected]>
   */
 
-#include <common.h>
  #include <init.h>
  #include <log.h>
  #include <net.h>
arch/arm/mach-meson/board-gx.c +0 -1
index c3fbdfffeae8..0370ed57e205 100644
@@ -4,7 +4,6 @@
   * (C) Copyright 2018 Neil Armstrong <[email protected]>
   */
 
-#include <common.h>
  #include <init.h>
  #include <net.h>
  #include <asm/arch/boot.h>
arch/arm/mach-meson/board-info.c +0 -1
index d51d9b8f0645..b4058f593234 100644
@@ -4,7 +4,6 @@
   * (C) Copyright 2019 Neil Armstrong <[email protected]>
   */
 
-#include <common.h>
  #include <init.h>
  #include <asm/global_data.h>
  #include <asm/io.h>
arch/arm/mach-meson/sm.c +0 -0
index 914fd11c9894..4d9f83d3b38d 100644

arch/arm/mach-meson/sm.c line 10

Quoted 7 lines
arch/arm/mach-meson/sm.c +0 -1
@@ -5,7 +5,6 @@
   * Secure monitor calls.
   */
 
-#include <common.h>
  #include <dm.h>
  #include <log.h>
  #include <regmap.h>
author
#23 lore raw

PATCH 20/33 arm: mediatek: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-mediatek files and when needed add missing include files directly.

---
Cc: Ryder Lee <[email protected]>
Cc: Weijie Gao <[email protected]>
Cc: Chunfeng Yun <[email protected]>
Cc: GSS_MTK_Uboot_upstream <[email protected]>

---
 arch/arm/mach-mediatek/cpu.c         | 1 -
 arch/arm/mach-mediatek/mt7623/init.c | 2 +-
 arch/arm/mach-mediatek/mt7629/init.c | 2 +-
 arch/arm/mach-mediatek/mt8183/init.c | 1 -
 arch/arm/mach-mediatek/mt8512/init.c | 1 -
 arch/arm/mach-mediatek/mt8516/init.c | 1 -
 arch/arm/mach-mediatek/mt8518/init.c | 1 -
 arch/arm/mach-mediatek/spl.c         | 1 -
 8 files changed, 2 insertions(+), 8 deletions(-)
arch/arm/mach-mediatek/cpu.c +0 -1
index c329e7cc98a8..8e8bc4f9ceaa 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018 MediaTek Inc.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <init.h>
arch/arm/mach-mediatek/mt7623/init.c +1 -1
index 988b057e5984..3d6ba3f383c5 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 MediaTek Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/io.h>
arch/arm/mach-mediatek/mt7629/init.c +1 -1
index 0130554ff35c..7cb8b72c364c 100644
@@ -5,7 +5,7 @@
  */
 
 #include <clk.h>
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
arch/arm/mach-mediatek/mt8183/init.c +0 -1
index 7496029705f6..37243547da81 100644
@@ -6,7 +6,6 @@
  */
 
 #include <clk.h>
-#include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <ram.h>
arch/arm/mach-mediatek/mt8512/init.c +0 -1
index 5a21e9a4485c..3b48caf5196c 100644
@@ -7,7 +7,6 @@
  */
 
 #include <clk.h>
-#include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <init.h>
arch/arm/mach-mediatek/mt8516/init.c +0 -1
index 3460dcc24943..892bd441a33b 100644
@@ -6,7 +6,6 @@
  */
 
 #include <clk.h>
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdtdec.h>
arch/arm/mach-mediatek/mt8518/init.c +0 -1
index f7e03de36507..c04bcb635178 100644
@@ -7,7 +7,6 @@
  */
 
 #include <clk.h>
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdtdec.h>
arch/arm/mach-mediatek/spl.c +0 -1
index d3cda94617e1..247d7ee6f1db 100644
@@ -5,7 +5,6 @@
  */
 
 #include <clk.h>
-#include <common.h>
 #include <hang.h>
 #include <init.h>
 #include <spl.h>
Signature · 1 line
2.34.1
author
#24 lore raw

PATCH 21/33 arm: lpc32xx: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-lpc32xx files and when needed add missing include files directly.

---
 arch/arm/mach-lpc32xx/clk.c     | 1 -
 arch/arm/mach-lpc32xx/cpu.c     | 1 -
 arch/arm/mach-lpc32xx/devices.c | 2 +-
 arch/arm/mach-lpc32xx/dram.c    | 1 -
 arch/arm/mach-lpc32xx/timer.c   | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)
arch/arm/mach-lpc32xx/clk.c +0 -1
index cb2344d79fec..2e11903e7e07 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2011 by Vladimir Zapolskiy <[email protected]>
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <div64.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-lpc32xx/cpu.c +0 -1
index a97f9a1958ab..80f5e7c88eb4 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2011-2015 by Vladimir Zapolskiy <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
arch/arm/mach-lpc32xx/devices.c +1 -1
index 6a67a3591aa6..49308d6d4be0 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2011 by Vladimir Zapolskiy <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <ns16550.h>
 
arch/arm/mach-lpc32xx/dram.c +0 -1
index 160223792353..ab7c13512a5a 100644
@@ -10,7 +10,6 @@
  * This code runs from SRAM.
  */
 
-#include <common.h>
 #include <netdev.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
arch/arm/mach-lpc32xx/timer.c +0 -1
index 90183e3014eb..523f9cfc8c48 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2011 Vladimir Zapolskiy <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/arch/cpu.h>
Signature · 1 line
2.34.1
author
#25 lore raw

PATCH 22/33 arm: kirkwood: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-kirkwood files and when needed add missing include files directly.

---
Cc: Stefan Roese <[email protected]>

---
 arch/arm/mach-kirkwood/cache.c | 1 -
 arch/arm/mach-kirkwood/cpu.c   | 1 -
 arch/arm/mach-kirkwood/mpp.c   | 1 -
 3 files changed, 3 deletions(-)
arch/arm/mach-kirkwood/cache.c +0 -1
index 009b7deeca64..acd2e8b1145e 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2012 Michael Walle
  * Michael Walle <[email protected]>
  */
-#include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/cache.h>
 
arch/arm/mach-kirkwood/cpu.c +0 -1
index 2b493b36c20d..a432abe615d3 100644
@@ -5,7 +5,6 @@
  * Written-by: Prafulla Wadaskar <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>
arch/arm/mach-kirkwood/mpp.c +0 -1
index 4fdad99cadef..7938820e513f 100644
@@ -9,7 +9,6 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
Signature · 1 line
2.34.1
author
#26 lore raw

PATCH 23/33 arm: imx: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-imx, CPU specific sub-directories and include/asm/arch-mx* files and when needed add missing include files directly.

---
Cc: Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: "NXP i.MX U-Boot Team" <[email protected]>

---
 arch/arm/cpu/arm1136/mx31/devices.c         | 1 -
 arch/arm/cpu/arm1136/mx31/generic.c         | 1 -
 arch/arm/cpu/arm1136/mx31/timer.c           | 1 -
 arch/arm/cpu/arm926ejs/mxs/clock.c          | 1 -
 arch/arm/cpu/arm926ejs/mxs/iomux.c          | 1 -
 arch/arm/cpu/arm926ejs/mxs/mxs.c            | 1 -
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c       | 1 -
 arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 1 -
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c   | 1 -
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 -
 arch/arm/cpu/arm926ejs/mxs/start.S          | 1 -
 arch/arm/cpu/arm926ejs/mxs/timer.c          | 1 -
 arch/arm/include/asm/arch-mx5/clock.h       | 2 ++
 arch/arm/include/asm/arch-mx7/sys_proto.h   | 2 ++
 arch/arm/mach-imx/cache.c                   | 2 +-
 arch/arm/mach-imx/cmd_bmode.c               | 1 -
 arch/arm/mach-imx/cmd_dek.c                 | 3 ++-
 arch/arm/mach-imx/cmd_hdmidet.c             | 1 -
 arch/arm/mach-imx/cmd_mfgprot.c             | 2 +-
 arch/arm/mach-imx/cmd_nandbcb.c             | 1 -
 arch/arm/mach-imx/cpu.c                     | 1 -
 arch/arm/mach-imx/ddrmc-vf610-calibration.c | 1 -
 arch/arm/mach-imx/ddrmc-vf610.c             | 1 -
 arch/arm/mach-imx/ele_ahab.c                | 2 +-
 arch/arm/mach-imx/hab.c                     | 1 -
 arch/arm/mach-imx/i2c-mxv7.c                | 2 +-
 arch/arm/mach-imx/image-container.c         | 2 +-
 arch/arm/mach-imx/imx8/ahab.c               | 1 -
 arch/arm/mach-imx/imx8/clock.c              | 1 -
 arch/arm/mach-imx/imx8/cpu.c                | 1 -
 arch/arm/mach-imx/imx8/fdt.c                | 1 -
 arch/arm/mach-imx/imx8/iomux.c              | 1 -
 arch/arm/mach-imx/imx8/misc.c               | 1 -
 arch/arm/mach-imx/imx8/snvs_security_sc.c   | 1 -
 arch/arm/mach-imx/imx8m/clock_imx8mm.c      | 1 -
 arch/arm/mach-imx/imx8m/clock_imx8mq.c      | 1 -
 arch/arm/mach-imx/imx8m/clock_slice.c       | 1 -
 arch/arm/mach-imx/imx8m/psci.c              | 1 -
 arch/arm/mach-imx/imx8m/soc.c               | 2 +-
 arch/arm/mach-imx/imx8ulp/cgc.c             | 1 -
 arch/arm/mach-imx/imx8ulp/clock.c           | 1 -
 arch/arm/mach-imx/imx8ulp/iomux.c           | 1 -
 arch/arm/mach-imx/imx8ulp/pcc.c             | 1 -
 arch/arm/mach-imx/imx8ulp/rdc.c             | 3 ++-
 arch/arm/mach-imx/imx9/clock.c              | 1 -
 arch/arm/mach-imx/imx9/clock_root.c         | 2 +-
 arch/arm/mach-imx/imx9/imx_bootaux.c        | 3 ++-
 arch/arm/mach-imx/imx9/soc.c                | 2 +-
 arch/arm/mach-imx/imx9/trdc.c               | 2 +-
 arch/arm/mach-imx/imx_bootaux.c             | 5 ++++-
 arch/arm/mach-imx/imxrt/soc.c               | 1 -
 arch/arm/mach-imx/iomux-v3.c                | 1 -
 arch/arm/mach-imx/mac.c                     | 1 -
 arch/arm/mach-imx/misc.c                    | 1 -
 arch/arm/mach-imx/mmc_env.c                 | 1 -
 arch/arm/mach-imx/mmdc_size.c               | 2 +-
 arch/arm/mach-imx/mx5/clock.c               | 1 -
 arch/arm/mach-imx/mx5/mx53_dram.c           | 2 +-
 arch/arm/mach-imx/mx5/soc.c                 | 1 -
 arch/arm/mach-imx/mx6/clock.c               | 2 +-
 arch/arm/mach-imx/mx6/ddr.c                 | 1 -
 arch/arm/mach-imx/mx6/litesom.c             | 2 +-
 arch/arm/mach-imx/mx6/module_fuse.c         | 1 -
 arch/arm/mach-imx/mx6/mp.c                  | 1 -
 arch/arm/mach-imx/mx6/opos6ul.c             | 2 +-
 arch/arm/mach-imx/mx6/soc.c                 | 1 -
 arch/arm/mach-imx/mx7/clock.c               | 3 ++-
 arch/arm/mach-imx/mx7/clock_slice.c         | 1 -
 arch/arm/mach-imx/mx7/ddr.c                 | 1 -
 arch/arm/mach-imx/mx7/psci-mx7.c            | 1 -
 arch/arm/mach-imx/mx7/soc.c                 | 1 -
 arch/arm/mach-imx/mx7ulp/clock.c            | 2 +-
 arch/arm/mach-imx/mx7ulp/iomux.c            | 1 -
 arch/arm/mach-imx/mx7ulp/pcc.c              | 1 -
 arch/arm/mach-imx/mx7ulp/scg.c              | 2 +-
 arch/arm/mach-imx/mx7ulp/soc.c              | 2 +-
 arch/arm/mach-imx/priblob.c                 | 1 -
 arch/arm/mach-imx/rdc-sema.c                | 1 -
 arch/arm/mach-imx/speed.c                   | 2 +-
 arch/arm/mach-imx/spl.c                     | 2 +-
 arch/arm/mach-imx/spl_imx_romapi.c          | 1 -
 arch/arm/mach-imx/syscounter.c              | 2 +-
 arch/arm/mach-imx/timer.c                   | 1 -
 arch/arm/mach-imx/video.c                   | 3 ++-
 84 files changed, 38 insertions(+), 82 deletions(-)
arch/arm/cpu/arm1136/mx31/devices.c +0 -1
index 9997e8fc3396..87ca303e31ba 100644
@@ -6,7 +6,6 @@
  * (c) 2007 Pengutronix, Sascha Hauer <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 
arch/arm/cpu/arm1136/mx31/generic.c +0 -1
index a3d4f1479623..fc56baccfcd6 100644
@@ -4,7 +4,6 @@
  * Sascha Hauer, Pengutronix
  */
 
-#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <asm/arch/imx-regs.h>
arch/arm/cpu/arm1136/mx31/timer.c +0 -1
index a913860491cb..b41ca68ae552 100644
@@ -4,7 +4,6 @@
  * Sascha Hauer, Pengutronix
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
arch/arm/cpu/arm926ejs/mxs/clock.c +0 -1
index 4e1cf3a1e32b..58f6cf80cae0 100644
@@ -9,7 +9,6 @@
  * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <linux/errno.h>
 #include <asm/io.h>
arch/arm/cpu/arm926ejs/mxs/iomux.c +0 -1
index 381264b8a18d..851b4deb080b 100644
@@ -6,7 +6,6 @@
  *                       <[email protected]>
  */
 
-#include <common.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
arch/arm/cpu/arm926ejs/mxs/mxs.c +0 -1
index 4f3cb63c56df..7b2bb09551b5 100644
@@ -9,7 +9,6 @@
  * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <hang.h>
arch/arm/cpu/arm926ejs/mxs/spl_boot.c +0 -1
index 249f8de8fbe1..76a69d7f9586 100644
@@ -6,7 +6,6 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
-#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c +0 -1
index 2cfbd780953d..b2d3b2b13efd 100644
@@ -6,7 +6,6 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
-#include <common.h>
 #include <config.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +0 -1
index a94803ee93d9..c3136dd8976a 100644
@@ -6,7 +6,6 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
-#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +0 -1
index 77bca7e331a0..8b65c094a8ad 100644
@@ -6,7 +6,6 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
-#include <common.h>
 #include <config.h>
 #include <hang.h>
 #include <log.h>
arch/arm/cpu/arm926ejs/mxs/start.S +0 -1
index 61982e38a1d4..a6eb053cadb0 100644
@@ -20,7 +20,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <common.h>
 #include <system-constants.h>
 
 /*
arch/arm/cpu/arm926ejs/mxs/timer.c +0 -1
index 3dff3d768d1c..cbd3b5d9958a 100644
@@ -9,7 +9,6 @@
  * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/include/asm/arch-mx5/clock.h +2 -0
index d585b5cf4b22..58013a85951a 100644
@@ -7,6 +7,8 @@
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#include <stdbool.h>
+
 #ifdef CONFIG_SYS_MX5_HCLK
 #define MXC_HCLK	CONFIG_SYS_MX5_HCLK
 #else
arch/arm/include/asm/arch-mx7/sys_proto.h +2 -0
index 634736cc09cd..5da0037b2c6b 100644
@@ -7,6 +7,8 @@
 
 #include <asm/mach-imx/sys_proto.h>
 
+struct wdog_regs;
+
 void set_wdog_reset(struct wdog_regs *wdog);
 
 #endif /* __SYS_PROTO_IMX7_ */
arch/arm/mach-imx/cache.c +1 -1
index ab9b621a2a62..b368db49fce5 100644
@@ -3,7 +3,7 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
arch/arm/mach-imx/cmd_bmode.c +0 -1
index 5b2f4686230c..c20e80725f8b 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2012 Boundary Devices Inc.
  */
-#include <common.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/mach-imx/boot_mode.h>
arch/arm/mach-imx/cmd_dek.c +2 -1
index 2f389dbe8df0..c7962ead2d54 100644
@@ -6,7 +6,7 @@
  * Command for encapsulating DEK blob
  */
 
-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
@@ -17,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <mapmem.h>
 #include <tee.h>
+#include <vsprintf.h>
 #ifdef CONFIG_IMX_SECO_DEK_ENCAP
 #include <imx_container.h>
 #include <firmware/imx/sci/sci.h>
arch/arm/mach-imx/cmd_hdmidet.c +0 -1
index e2571adfb006..8104ab26b08f 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2012 Boundary Devices Inc.
  */
-#include <common.h>
 #include <command.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mxc_hdmi.h>
arch/arm/mach-imx/cmd_mfgprot.c +1 -1
index 9576b48dde30..9925c9922687 100644
@@ -11,7 +11,7 @@
 #include <asm/arch/clock.h>
 #include <linux/compiler.h>
 #include <command.h>
-#include <common.h>
+#include <config.h>
 #include <env.h>
 #include <fsl_sec.h>
 #include <mapmem.h>
arch/arm/mach-imx/cmd_nandbcb.c +0 -1
index 70a213a49dd0..c2e452b69270 100644
@@ -11,7 +11,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
arch/arm/mach-imx/cpu.c +0 -1
index 488638c90585..ceee31eecd79 100644
@@ -7,7 +7,6 @@
  */
 
 #include <bootm.h>
-#include <common.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-imx/ddrmc-vf610-calibration.c +0 -1
index 7d787d045980..2cf684322ea3 100644
@@ -7,7 +7,6 @@
  *
  */
 /* #define DEBUG */
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/ddrmc-vf610.c +0 -1
index 7895ee66f8a8..e449fa6f552d 100644
@@ -6,7 +6,6 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-vf610.h>
arch/arm/mach-imx/ele_ahab.c +1 -1
index d02316ed6cb1..eaeecf600423 100644
@@ -3,7 +3,6 @@
  * Copyright 2022 NXP
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <imx_container.h>
@@ -15,6 +14,7 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-imx/hab.c +0 -1
index 27e053ef701c..85d90686f680 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <config.h>
 #include <display_options.h>
arch/arm/mach-imx/i2c-mxv7.c +1 -1
index a5866cf9f703..256db150818a 100644
@@ -2,8 +2,8 @@
 /*
  * Copyright (C) 2012 Boundary Devices Inc.
  */
-#include <common.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
arch/arm/mach-imx/image-container.c +1 -1
index 35da0ae04258..e2388e3fef86 100644
@@ -3,7 +3,7 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <errno.h>
 #include <imx_container.h>
 #include <log.h>
arch/arm/mach-imx/imx8/ahab.c +0 -1
index 1c072f6af11d..ed44df394b15 100644
@@ -3,7 +3,6 @@
  * Copyright 2018-2019, 2022 NXP
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <imx_container.h>
arch/arm/mach-imx/imx8/clock.c +0 -1
index 9941b57b4be5..4e49b5bf3755 100644
@@ -3,7 +3,6 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
arch/arm/mach-imx/imx8/cpu.c +0 -1
index 6e643188f402..627baa1d83fd 100644
@@ -3,7 +3,6 @@
  * Copyright 2018, 2021 NXP
  */
 
-#include <common.h>
 #include <clk.h>
 #include <cpu.h>
 #include <cpu_func.h>
arch/arm/mach-imx/imx8/fdt.c +0 -1
index c2bed3e0c1fb..6d0585f5cc67 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
 #include <log.h>
 #include <firmware/imx/sci/sci.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-imx/imx8/iomux.c +0 -1
index e4f7651bd1d4..3e27d75827a5 100644
@@ -3,7 +3,6 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
arch/arm/mach-imx/imx8/misc.c +0 -1
index 0ce3036818b6..c77104d0338f 100644
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-#include <common.h>
 #include <log.h>
 #include <firmware/imx/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
arch/arm/mach-imx/imx8/snvs_security_sc.c +0 -1
index 1eaa68f8d5ff..f13dfc155165 100644
@@ -14,7 +14,6 @@
 #include <command.h>
 #include <log.h>
 #include <stddef.h>
-#include <common.h>
 #include <firmware/imx/sci/sci.h>
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
arch/arm/mach-imx/imx8m/clock_imx8mm.c +0 -1
index 47219957b58c..de630e940c90 100644
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-imx/imx8m/clock_imx8mq.c +0 -1
index 9db62b944e4c..7e6c37487163 100644
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/imx8m/clock_slice.c +0 -1
index b5ed27a923e0..7cfdc46d349e 100644
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
arch/arm/mach-imx/imx8m/psci.c +0 -1
index 62f0b768cfa4..f5644c642bd6 100644
@@ -10,7 +10,6 @@
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
-#include <common.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <fsl_wdog.h>
arch/arm/mach-imx/imx8m/soc.c +1 -1
index 0c49fb9cd488..be38ca528850 100644
@@ -5,7 +5,7 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <event.h>
 #include <init.h>
arch/arm/mach-imx/imx8ulp/cgc.c +0 -1
index d2fadb4877c9..f9d8ed5b048b 100644
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <div64.h>
 #include <asm/io.h>
 #include <errno.h>
arch/arm/mach-imx/imx8ulp/clock.c +0 -1
index 36d12943a059..fadf165ece27 100644
@@ -3,7 +3,6 @@
  * Copyright 2020 NXP
  */
 
-#include <common.h>
 #include <command.h>
 #include <div64.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/imx8ulp/iomux.c +0 -1
index c6d20f546809..43f856bf7324 100644
@@ -3,7 +3,6 @@
  * Copyright 2020-2021 NXP
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
arch/arm/mach-imx/imx8ulp/pcc.c +0 -1
index e3c6d6760be2..449e496521f1 100644
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <div64.h>
 #include <asm/io.h>
 #include <errno.h>
arch/arm/mach-imx/imx8ulp/rdc.c +2 -1
index cfc09e79cbd5..ca657748ed9a 100644
@@ -3,7 +3,8 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
+#include <config.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/imx9/clock.c +0 -1
index 75d92af036a1..0abf4579a1e0 100644
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/imx9/clock_root.c +1 -1
index 7d7ae865946f..47106fffefba 100644
@@ -5,7 +5,7 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-imx/imx9/imx_bootaux.c +2 -1
index 6afb59e05159..73f2e72263d6 100644
@@ -3,11 +3,12 @@
  * Copyright 2022 NXP
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <imx_sip.h>
+#include <vsprintf.h>
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 
 int arch_auxiliary_core_check_up(u32 core_id)
 {
arch/arm/mach-imx/imx9/soc.c +1 -1
index 2117489f2320..32208220b207 100644
@@ -5,7 +5,7 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-imx/imx9/trdc.c +1 -1
index d0f855bb1bc1..8cdb28459a36 100644
@@ -3,8 +3,8 @@
  * Copyright 2022 NXP
  */
 
-#include <common.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/imx_bootaux.c +4 -1
index f7b14ca38d94..26374fdc33ec 100644
@@ -3,15 +3,18 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <log.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <command.h>
 #include <elf.h>
 #include <imx_sip.h>
+#include <vsprintf.h>
 #include <linux/arm-smccc.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
+#include <linux/string.h>
 #include <cpu_func.h>
 
 #ifndef CONFIG_IMX8
arch/arm/mach-imx/imxrt/soc.c +0 -1
index 34162a3976fb..3028957953bd 100644
@@ -4,7 +4,6 @@
  * Author(s): Giulio Benetti <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
arch/arm/mach-imx/iomux-v3.c +0 -1
index 18131a20f438..c134e95ed780 100644
@@ -7,7 +7,6 @@
  *
  * Copyright (C) 2004-2011 Freescale Semiconductor, Inc.
  */
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/iomux-v3.h>
arch/arm/mach-imx/mac.c +0 -1
index 9bb63d25b488..e739fd14c898 100644
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-imx/misc.c +0 -1
index 09a758ff6e89..7452b82f1105 100644
@@ -3,7 +3,6 @@
  * Copyright 2013 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
 #include <lmb.h>
 #include <log.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-imx/mmc_env.c +0 -1
index 9c822f721c60..34a7d1706f3d 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 NXP
  */
 
-#include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
arch/arm/mach-imx/mmdc_size.c +1 -1
index 41a5af6bd307..2b1d203f8635 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 
 #if defined(CONFIG_MX53)
arch/arm/mach-imx/mx5/clock.c +0 -1
index bbaddd5a33fa..0b8a10fd7294 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach-imx/mx5/mx53_dram.c +1 -1
index f74414419470..6459b4a82d25 100644
@@ -4,9 +4,9 @@
  * Patrick Bruenn <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-imx/mx5/soc.c +0 -1
index 47f531dc856c..4df5f9c16416 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
arch/arm/mach-imx/mx6/clock.c +1 -1
index e0da9c239584..fb9f56d2e63c 100644
@@ -3,10 +3,10 @@
  * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/mx6/ddr.c +0 -1
index 3c87c577737b..5a1258e002d2 100644
@@ -4,7 +4,6 @@
  * Author: Tim Harvey <[email protected]>
  */
 
-#include <common.h>
 #include <hang.h>
 #include <log.h>
 #include <linux/delay.h>
arch/arm/mach-imx/mx6/litesom.c +1 -1
index 2ba3245e226c..ab5de2665778 100644
@@ -17,7 +17,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
-#include <common.h>
+#include <config.h>
 #include <fsl_esdhc_imx.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
arch/arm/mach-imx/mx6/module_fuse.c +0 -1
index b58f11c1e562..8b23d48a854c 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
 #include <fdt_support.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-imx/mx6/mp.c +0 -1
index de9ace083ce8..091a37238316 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <linux/errno.h>
arch/arm/mach-imx/mx6/opos6ul.c +1 -1
index 38ead8ace20c..340e6147b638 100644
@@ -10,7 +10,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
-#include <common.h>
+#include <config.h>
 #include <env.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/arm/mach-imx/mx6/soc.c +0 -1
index c2875e727c94..3a3e01f3d0aa 100644
@@ -7,7 +7,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <env.h>
 #include <init.h>
 #include <linux/delay.h>
arch/arm/mach-imx/mx7/clock.c +2 -1
index 4e232385afc3..a8606fa9b24b 100644
@@ -6,11 +6,12 @@
  *	Peng Fan <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
arch/arm/mach-imx/mx7/clock_slice.c +0 -1
index dd731d949621..2a1304fc1128 100644
@@ -6,7 +6,6 @@
  *	Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <div64.h>
 #include <asm/io.h>
 #include <linux/errno.h>
arch/arm/mach-imx/mx7/ddr.c +0 -1
index cf25569765ea..c4a90be3945b 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx7-ddr.h>
-#include <common.h>
 #include <linux/delay.h>
 
 /*
arch/arm/mach-imx/mx7/psci-mx7.c +0 -1
index 0b71fa403446..12d6a63b9255 100644
@@ -13,7 +13,6 @@
 #include <asm/armv7.h>
 #include <asm/gic.h>
 #include <linux/bitops.h>
-#include <common.h>
 #include <fsl_wdog.h>
 
 #define GPC_LPCR_A7_BSC	0x0
arch/arm/mach-imx/mx7/soc.c +0 -1
index 689dbefe8ee0..16c77cbf7bee 100644
@@ -4,7 +4,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/mx7ulp/clock.c +1 -1
index 37d8565c20fc..fb19c62a5200 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <command.h>
 #include <div64.h>
arch/arm/mach-imx/mx7ulp/iomux.c +0 -1
index 05ddeed2a64b..2c87a8c18b96 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/mx7ulp/pcc.c +0 -1
index aa7ea86a443e..0bfd8f71815a 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <div64.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach-imx/mx7ulp/scg.c +1 -1
index 4c066557c1ca..d4fb5389cacb 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <div64.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach-imx/mx7ulp/soc.c +1 -1
index 217b7c45867d..198ae2d919c9 100644
@@ -4,7 +4,7 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-imx/priblob.c +0 -1
index 5b022d5c8201..65924483bc89 100644
@@ -11,7 +11,6 @@
  */
 
 #include <asm/io.h>
-#include <common.h>
 #include <command.h>
 #include <fsl_sec.h>
 
arch/arm/mach-imx/rdc-sema.c +0 -1
index e683673753e1..56725cc109f0 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/rdc-sema.h>
arch/arm/mach-imx/speed.c +1 -1
index 0e81cc880a1a..98a42b22f9cc 100644
@@ -7,7 +7,7 @@
  * TsiChung Liew ([email protected])
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
arch/arm/mach-imx/spl.c +1 -1
index b30cd9625538..bc291dcd1296 100644
@@ -6,7 +6,7 @@
  * Author: Tim Harvey <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-imx/spl_imx_romapi.c +0 -1
index b9ff9bb83b3c..9a86f5c133f7 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
 #include <errno.h>
 #include <image.h>
 #include <imx_container.h>
arch/arm/mach-imx/syscounter.c +1 -1
index 16df1186759e..922f851c56b7 100644
@@ -5,7 +5,7 @@
  * The file use ls102xa/timer.c as a reference.
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/mach-imx/timer.c +0 -1
index fcd45f09f181..5ac8f28e670d 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/io.h>
arch/arm/mach-imx/video.c +2 -1
index 1bc9b7cc7e15..6cbb49da53cc 100644
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
+#include <stdio.h>
 #include <env.h>
 #include <linux/errno.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/video.h>
 
 #ifdef CONFIG_IMX_HDMI
Signature · 1 line
2.34.1
Acked-by on v1 23/33
#27 lore raw

RE: [PATCH 23/33] arm: imx: Remove <common.h> and add needed includes

Quoted 8 lines

Subject: [PATCH 23/33] arm: imx: Remove <common.h> and add needed includes

Remove <common.h> from all mach-imx, CPU specific sub-directories and include/asm/arch-mx* files and when needed add missing include files directly.

Quoted 1,202 lines

---
Cc: Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: "NXP i.MX U-Boot Team" <[email protected]>

---
 arch/arm/cpu/arm1136/mx31/devices.c         | 1 -
 arch/arm/cpu/arm1136/mx31/generic.c         | 1 -
 arch/arm/cpu/arm1136/mx31/timer.c           | 1 -
 arch/arm/cpu/arm926ejs/mxs/clock.c          | 1 -
 arch/arm/cpu/arm926ejs/mxs/iomux.c          | 1 -
 arch/arm/cpu/arm926ejs/mxs/mxs.c            | 1 -
 arch/arm/cpu/arm926ejs/mxs/spl_boot.c       | 1 -
 arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 1 -
 arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c   | 1 -
 arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 1 -
 arch/arm/cpu/arm926ejs/mxs/start.S          | 1 -
 arch/arm/cpu/arm926ejs/mxs/timer.c          | 1 -
 arch/arm/include/asm/arch-mx5/clock.h       | 2 ++
 arch/arm/include/asm/arch-mx7/sys_proto.h   | 2 ++
 arch/arm/mach-imx/cache.c                   | 2 +-
 arch/arm/mach-imx/cmd_bmode.c               | 1 -
 arch/arm/mach-imx/cmd_dek.c                 | 3 ++-
 arch/arm/mach-imx/cmd_hdmidet.c             | 1 -
 arch/arm/mach-imx/cmd_mfgprot.c             | 2 +-
 arch/arm/mach-imx/cmd_nandbcb.c             | 1 -
 arch/arm/mach-imx/cpu.c                     | 1 -
 arch/arm/mach-imx/ddrmc-vf610-calibration.c | 1 -
 arch/arm/mach-imx/ddrmc-vf610.c             | 1 -
 arch/arm/mach-imx/ele_ahab.c                | 2 +-
 arch/arm/mach-imx/hab.c                     | 1 -
 arch/arm/mach-imx/i2c-mxv7.c                | 2 +-
 arch/arm/mach-imx/image-container.c         | 2 +-
 arch/arm/mach-imx/imx8/ahab.c               | 1 -
 arch/arm/mach-imx/imx8/clock.c              | 1 -
 arch/arm/mach-imx/imx8/cpu.c                | 1 -
 arch/arm/mach-imx/imx8/fdt.c                | 1 -
 arch/arm/mach-imx/imx8/iomux.c              | 1 -
 arch/arm/mach-imx/imx8/misc.c               | 1 -
 arch/arm/mach-imx/imx8/snvs_security_sc.c   | 1 -
 arch/arm/mach-imx/imx8m/clock_imx8mm.c      | 1 -
 arch/arm/mach-imx/imx8m/clock_imx8mq.c      | 1 -
 arch/arm/mach-imx/imx8m/clock_slice.c       | 1 -
 arch/arm/mach-imx/imx8m/psci.c              | 1 -
 arch/arm/mach-imx/imx8m/soc.c               | 2 +-
 arch/arm/mach-imx/imx8ulp/cgc.c             | 1 -
 arch/arm/mach-imx/imx8ulp/clock.c           | 1 -
 arch/arm/mach-imx/imx8ulp/iomux.c           | 1 -
 arch/arm/mach-imx/imx8ulp/pcc.c             | 1 -
 arch/arm/mach-imx/imx8ulp/rdc.c             | 3 ++-
 arch/arm/mach-imx/imx9/clock.c              | 1 -
 arch/arm/mach-imx/imx9/clock_root.c         | 2 +-
 arch/arm/mach-imx/imx9/imx_bootaux.c        | 3 ++-
 arch/arm/mach-imx/imx9/soc.c                | 2 +-
 arch/arm/mach-imx/imx9/trdc.c               | 2 +-
 arch/arm/mach-imx/imx_bootaux.c             | 5 ++++-
 arch/arm/mach-imx/imxrt/soc.c               | 1 -
 arch/arm/mach-imx/iomux-v3.c                | 1 -
 arch/arm/mach-imx/mac.c                     | 1 -
 arch/arm/mach-imx/misc.c                    | 1 -
 arch/arm/mach-imx/mmc_env.c                 | 1 -
 arch/arm/mach-imx/mmdc_size.c               | 2 +-
 arch/arm/mach-imx/mx5/clock.c               | 1 -
 arch/arm/mach-imx/mx5/mx53_dram.c           | 2 +-
 arch/arm/mach-imx/mx5/soc.c                 | 1 -
 arch/arm/mach-imx/mx6/clock.c               | 2 +-
 arch/arm/mach-imx/mx6/ddr.c                 | 1 -
 arch/arm/mach-imx/mx6/litesom.c             | 2 +-
 arch/arm/mach-imx/mx6/module_fuse.c         | 1 -
 arch/arm/mach-imx/mx6/mp.c                  | 1 -
 arch/arm/mach-imx/mx6/opos6ul.c             | 2 +-
 arch/arm/mach-imx/mx6/soc.c                 | 1 -
 arch/arm/mach-imx/mx7/clock.c               | 3 ++-
 arch/arm/mach-imx/mx7/clock_slice.c         | 1 -
 arch/arm/mach-imx/mx7/ddr.c                 | 1 -
 arch/arm/mach-imx/mx7/psci-mx7.c            | 1 -
 arch/arm/mach-imx/mx7/soc.c                 | 1 -
 arch/arm/mach-imx/mx7ulp/clock.c            | 2 +-
 arch/arm/mach-imx/mx7ulp/iomux.c            | 1 -
 arch/arm/mach-imx/mx7ulp/pcc.c              | 1 -
 arch/arm/mach-imx/mx7ulp/scg.c              | 2 +-
 arch/arm/mach-imx/mx7ulp/soc.c              | 2 +-
 arch/arm/mach-imx/priblob.c                 | 1 -
 arch/arm/mach-imx/rdc-sema.c                | 1 -
 arch/arm/mach-imx/speed.c                   | 2 +-
 arch/arm/mach-imx/spl.c                     | 2 +-
 arch/arm/mach-imx/spl_imx_romapi.c          | 1 -
 arch/arm/mach-imx/syscounter.c              | 2 +-
 arch/arm/mach-imx/timer.c                   | 1 -
 arch/arm/mach-imx/video.c                   | 3 ++-
 84 files changed, 38 insertions(+), 82 deletions(-)
arch/arm/cpu/arm1136/mx31/devices.c +0 -1
index 9997e8fc3396..87ca303e31ba 100644
@@ -6,7 +6,6 @@
  * (c) 2007 Pengutronix, Sascha Hauer <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 
arch/arm/cpu/arm1136/mx31/generic.c +0 -1
index a3d4f1479623..fc56baccfcd6 100644
@@ -4,7 +4,6 @@
  * Sascha Hauer, Pengutronix
  */
 
-#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <asm/arch/imx-regs.h>
arch/arm/cpu/arm1136/mx31/timer.c +0 -1
index a913860491cb..b41ca68ae552 100644
@@ -4,7 +4,6 @@
  * Sascha Hauer, Pengutronix
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
arch/arm/cpu/arm926ejs/mxs/clock.c +0 -1
index 4e1cf3a1e32b..58f6cf80cae0 100644
@@ -9,7 +9,6 @@
  * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <linux/errno.h>
 #include <asm/io.h>
arch/arm/cpu/arm926ejs/mxs/iomux.c +0 -1
index 381264b8a18d..851b4deb080b 100644
@@ -6,7 +6,6 @@
  *                       <[email protected]>
  */
 
-#include <common.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
arch/arm/cpu/arm926ejs/mxs/mxs.c +0 -1
index 4f3cb63c56df..7b2bb09551b5 100644
@@ -9,7 +9,6 @@
  * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <hang.h>
arch/arm/cpu/arm926ejs/mxs/spl_boot.c +0 -1
index 249f8de8fbe1..76a69d7f9586 100644
@@ -6,7 +6,6 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
-#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c +0 -1
index 2cfbd780953d..b2d3b2b13efd 100644
@@ -6,7 +6,6 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
-#include <common.h>
 #include <config.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +0 -1
index a94803ee93d9..c3136dd8976a 100644
@@ -6,7 +6,6 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
-#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +0 -1
index 77bca7e331a0..8b65c094a8ad 100644
@@ -6,7 +6,6 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
-#include <common.h>
 #include <config.h>
 #include <hang.h>
 #include <log.h>
arch/arm/cpu/arm926ejs/mxs/start.S +0 -1
index 61982e38a1d4..a6eb053cadb0 100644
@@ -20,7 +20,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <common.h>
 #include <system-constants.h>
 
 /*
arch/arm/cpu/arm926ejs/mxs/timer.c +0 -1
index 3dff3d768d1c..cbd3b5d9958a 100644
@@ -9,7 +9,6 @@
  * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/include/asm/arch-mx5/clock.h +2 -0
index d585b5cf4b22..58013a85951a 100644
@@ -7,6 +7,8 @@
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#include <stdbool.h>
+
 #ifdef CONFIG_SYS_MX5_HCLK
 #define MXC_HCLK	CONFIG_SYS_MX5_HCLK
 #else
arch/arm/include/asm/arch-mx7/sys_proto.h +2 -0
index 634736cc09cd..5da0037b2c6b 100644
@@ -7,6 +7,8 @@
 
 #include <asm/mach-imx/sys_proto.h>
 
+struct wdog_regs;
+
 void set_wdog_reset(struct wdog_regs *wdog);
 
 #endif /* __SYS_PROTO_IMX7_ */
arch/arm/mach-imx/cache.c index renamed from arch/arm/mach-imx/cache.c +0 -0

ab9b621a2a62..b368db49fce5 100644

arch/arm/mach-imx/cache.c +1 -1
@@ -3,7 +3,7 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
arch/arm/mach- renamed from arch/arm/mach-imx/cmd_bmode.c +0 -0

imx/cmd_bmode.c index 5b2f4686230c..c20e80725f8b 100644

arch/arm/mach-imx/cmd_bmode.c +0 -1
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2012 Boundary Devices Inc.
  */
-#include <common.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/mach-imx/boot_mode.h>
arch/arm/mach-imx/cmd_dek.c +2 -1
index 2f389dbe8df0..c7962ead2d54 100644
@@ -6,7 +6,7 @@
  * Command for encapsulating DEK blob
  */
 
-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
@@ -17,6 +17,7 @@
 #include <asm/arch/clock.h>
 #include <mapmem.h>
 #include <tee.h>
+#include <vsprintf.h>
 #ifdef CONFIG_IMX_SECO_DEK_ENCAP
 #include <imx_container.h>
 #include <firmware/imx/sci/sci.h>
arch/arm/mach- renamed from arch/arm/mach-imx/cmd_hdmidet.c +0 -0

imx/cmd_hdmidet.c index e2571adfb006..8104ab26b08f 100644

arch/arm/mach-imx/cmd_hdmidet.c +0 -1
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2012 Boundary Devices Inc.
  */
-#include <common.h>
 #include <command.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mxc_hdmi.h>
arch/arm/mach- renamed from arch/arm/mach-imx/cmd_mfgprot.c +0 -0

imx/cmd_mfgprot.c index 9576b48dde30..9925c9922687 100644

arch/arm/mach-imx/cmd_mfgprot.c +1 -1
@@ -11,7 +11,7 @@
 #include <asm/arch/clock.h>
 #include <linux/compiler.h>
 #include <command.h>
-#include <common.h>
+#include <config.h>
 #include <env.h>
 #include <fsl_sec.h>
 #include <mapmem.h>
arch/arm/mach- renamed from arch/arm/mach-imx/cmd_nandbcb.c +0 -0

imx/cmd_nandbcb.c index 70a213a49dd0..c2e452b69270 100644

arch/arm/mach-imx/cmd_nandbcb.c +0 -1
@@ -11,7 +11,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
arch/arm/mach-imx/cpu.c index renamed from arch/arm/mach-imx/cpu.c +0 -0

488638c90585..ceee31eecd79 100644

arch/arm/mach-imx/cpu.c +0 -1
@@ -7,7 +7,6 @@
  */
 
 #include <bootm.h>
-#include <common.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach- renamed from arch/arm/mach-imx/ddrmc-vf610-calibration.c +0 -0

imx/ddrmc-vf610-calibration.c
index 7d787d045980..2cf684322ea3 100644

arch/arm/mach-imx/ddrmc-vf610-calibration.c +0 -1
@@ -7,7 +7,6 @@
  *
  */
 /* #define DEBUG */
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/ddrmc- renamed from arch/arm/mach-imx/ddrmc-vf610.c +0 -0

vf610.c index 7895ee66f8a8..e449fa6f552d 100644

arch/arm/mach-imx/ddrmc-vf610.c +0 -1
@@ -6,7 +6,6 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-vf610.h>
arch/arm/mach-imx/ele_ahab.c +1 -1
index d02316ed6cb1..eaeecf600423 100644
@@ -3,7 +3,6 @@
  * Copyright 2022 NXP
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <imx_container.h>
@@ -15,6 +14,7 @@
 #include <console.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-imx/hab.c index renamed from arch/arm/mach-imx/hab.c +0 -0

27e053ef701c..85d90686f680 100644

arch/arm/mach-imx/hab.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright (C) 2010-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <config.h>
 #include <display_options.h>
arch/arm/mach-imx/i2c-mxv7.c +1 -1
index a5866cf9f703..256db150818a 100644
@@ -2,8 +2,8 @@
 /*
  * Copyright (C) 2012 Boundary Devices Inc.
  */
-#include <common.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <linux/delay.h>
arch/arm/mach- renamed from arch/arm/mach-imx/image-container.c +0 -0

imx/image-container.c
index 35da0ae04258..e2388e3fef86 100644

arch/arm/mach-imx/image-container.c +1 -1
@@ -3,7 +3,7 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <errno.h>
 #include <imx_container.h>
 #include <log.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8/ahab.c +0 -0

imx/imx8/ahab.c index 1c072f6af11d..ed44df394b15 100644

arch/arm/mach-imx/imx8/ahab.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2018-2019, 2022 NXP
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <imx_container.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8/clock.c +0 -0

imx/imx8/clock.c index 9941b57b4be5..4e49b5bf3755 100644

arch/arm/mach-imx/imx8/clock.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/arch/clock.h>
arch/arm/mach-imx/imx8/cpu.c +0 -1
index 6e643188f402..627baa1d83fd 100644
@@ -3,7 +3,6 @@
  * Copyright 2018, 2021 NXP
  */
 
-#include <common.h>
 #include <clk.h>
 #include <cpu.h>
 #include <cpu_func.h>
arch/arm/mach-imx/imx8/fdt.c +0 -1
index c2bed3e0c1fb..6d0585f5cc67 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
 #include <log.h>
 #include <firmware/imx/sci/sci.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8/iomux.c +0 -0

imx/imx8/iomux.c index e4f7651bd1d4..3e27d75827a5 100644

arch/arm/mach-imx/imx8/iomux.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8/misc.c +0 -0

imx/imx8/misc.c index 0ce3036818b6..c77104d0338f 100644

arch/arm/mach-imx/imx8/misc.c +0 -1
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-#include <common.h>
 #include <log.h>
 #include <firmware/imx/sci/sci.h>
 #include <asm/mach-imx/sys_proto.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8/snvs_security_sc.c +0 -0

imx/imx8/snvs_security_sc.c
index 1eaa68f8d5ff..f13dfc155165 100644

arch/arm/mach-imx/imx8/snvs_security_sc.c +0 -1
@@ -14,7 +14,6 @@
 #include <command.h>
 #include <log.h>
 #include <stddef.h>
-#include <common.h>
 #include <firmware/imx/sci/sci.h>
 #include <asm/arch-imx8/imx8-pins.h>
 #include <asm/arch-imx8/snvs_security_sc.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8m/clock_imx8mm.c +0 -0

imx/imx8m/clock_imx8mm.c
index 47219957b58c..de630e940c90 100644

arch/arm/mach-imx/imx8m/clock_imx8mm.c +0 -1
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8m/clock_imx8mq.c +0 -0

imx/imx8m/clock_imx8mq.c
index 9db62b944e4c..7e6c37487163 100644

arch/arm/mach-imx/imx8m/clock_imx8mq.c +0 -1
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8m/clock_slice.c +0 -0

imx/imx8m/clock_slice.c
index b5ed27a923e0..7cfdc46d349e 100644

arch/arm/mach-imx/imx8m/clock_slice.c +0 -1
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8m/psci.c +0 -0

imx/imx8m/psci.c index 62f0b768cfa4..f5644c642bd6 100644

arch/arm/mach-imx/imx8m/psci.c +0 -1
@@ -10,7 +10,6 @@
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
-#include <common.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <fsl_wdog.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8m/soc.c +0 -0

imx/imx8m/soc.c index 0c49fb9cd488..be38ca528850 100644

arch/arm/mach-imx/imx8m/soc.c +1 -1
@@ -5,7 +5,7 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <event.h>
 #include <init.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8ulp/cgc.c +0 -0

imx/imx8ulp/cgc.c index d2fadb4877c9..f9d8ed5b048b 100644

arch/arm/mach-imx/imx8ulp/cgc.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <div64.h>
 #include <asm/io.h>
 #include <errno.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8ulp/clock.c +0 -0

imx/imx8ulp/clock.c
index 36d12943a059..fadf165ece27 100644

arch/arm/mach-imx/imx8ulp/clock.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2020 NXP
  */
 
-#include <common.h>
 #include <command.h>
 #include <div64.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8ulp/iomux.c +0 -0

imx/imx8ulp/iomux.c
index c6d20f546809..43f856bf7324 100644

arch/arm/mach-imx/imx8ulp/iomux.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2020-2021 NXP
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8ulp/pcc.c +0 -0

imx/imx8ulp/pcc.c index e3c6d6760be2..449e496521f1 100644

arch/arm/mach-imx/imx8ulp/pcc.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <div64.h>
 #include <asm/io.h>
 #include <errno.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx8ulp/rdc.c +0 -0

imx/imx8ulp/rdc.c index cfc09e79cbd5..ca657748ed9a 100644

arch/arm/mach-imx/imx8ulp/rdc.c +2 -1
@@ -3,7 +3,8 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
+#include <config.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx9/clock.c +0 -0

imx/imx9/clock.c index 75d92af036a1..0abf4579a1e0 100644

arch/arm/mach-imx/imx9/clock.c +0 -1
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx9/clock_root.c +0 -0

imx/imx9/clock_root.c
index 7d7ae865946f..47106fffefba 100644

arch/arm/mach-imx/imx9/clock_root.c +1 -1
@@ -5,7 +5,7 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx9/imx_bootaux.c +0 -0

imx/imx9/imx_bootaux.c
index 6afb59e05159..73f2e72263d6 100644

arch/arm/mach-imx/imx9/imx_bootaux.c +2 -1
@@ -3,11 +3,12 @@
  * Copyright 2022 NXP
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <imx_sip.h>
+#include <vsprintf.h>
 #include <linux/arm-smccc.h>
+#include <linux/errno.h>
 
 int arch_auxiliary_core_check_up(u32 core_id)  { diff --git a/arch/arm/mach-

imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c index 2117489f2320..32208220b207 100644

arch/arm/mach-imx/imx9/soc.c +1 -1
@@ -5,7 +5,7 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx9/trdc.c +0 -0

imx/imx9/trdc.c index d0f855bb1bc1..8cdb28459a36 100644

arch/arm/mach-imx/imx9/trdc.c +1 -1
@@ -3,8 +3,8 @@
  * Copyright 2022 NXP
  */
 
-#include <common.h>
 #include <log.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach- renamed from arch/arm/mach-imx/imx_bootaux.c +0 -0

imx/imx_bootaux.c index f7b14ca38d94..26374fdc33ec 100644

arch/arm/mach-imx/imx_bootaux.c +4 -1
@@ -3,15 +3,18 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <log.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <asm/mach-imx/sys_proto.h>
 #include <command.h>
 #include <elf.h>
 #include <imx_sip.h>
+#include <vsprintf.h>
 #include <linux/arm-smccc.h>
 #include <linux/compiler.h>
+#include <linux/errno.h>
+#include <linux/string.h>
 #include <cpu_func.h>
 
 #ifndef CONFIG_IMX8
arch/arm/mach-imx/imxrt/soc.c +0 -1
index 34162a3976fb..3028957953bd 100644
@@ -4,7 +4,6 @@
  * Author(s): Giulio Benetti <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
arch/arm/mach-imx/iomux-v3.c +0 -1
index 18131a20f438..c134e95ed780 100644
@@ -7,7 +7,6 @@
  *
  * Copyright (C) 2004-2011 Freescale Semiconductor, Inc.
  */
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/iomux-v3.h>
arch/arm/mach-imx/mac.c index renamed from arch/arm/mach-imx/mac.c +0 -0

9bb63d25b488..e739fd14c898 100644

arch/arm/mach-imx/mac.c +0 -1
@@ -5,7 +5,6 @@
  * Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-imx/misc.c index renamed from arch/arm/mach-imx/misc.c +0 -0

09a758ff6e89..7452b82f1105 100644

arch/arm/mach-imx/misc.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2013 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
 #include <lmb.h>
 #include <log.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mmc_env.c +0 -0

imx/mmc_env.c index 9c822f721c60..34a7d1706f3d 100644

arch/arm/mach-imx/mmc_env.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 NXP
  */
 
-#include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mmdc_size.c +0 -0

imx/mmdc_size.c index 41a5af6bd307..2b1d203f8635 100644

arch/arm/mach-imx/mmdc_size.c +1 -1
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 
 #if defined(CONFIG_MX53)
arch/arm/mach- renamed from arch/arm/mach-imx/mx5/clock.c +0 -0

imx/mx5/clock.c index bbaddd5a33fa..0b8a10fd7294 100644

arch/arm/mach-imx/mx5/clock.c +0 -1
@@ -6,7 +6,6 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx5/mx53_dram.c +0 -0

imx/mx5/mx53_dram.c
index f74414419470..6459b4a82d25 100644

arch/arm/mach-imx/mx5/mx53_dram.c +1 -1
@@ -4,9 +4,9 @@
  * Patrick Bruenn <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/arm/mach-imx/mx5/soc.c +0 -1
index 47f531dc856c..4df5f9c16416 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx6/clock.c +0 -0

imx/mx6/clock.c index e0da9c239584..fb9f56d2e63c 100644

arch/arm/mach-imx/mx6/clock.c +1 -1
@@ -3,10 +3,10 @@
  * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <time.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach-imx/mx6/ddr.c +0 -1
index 3c87c577737b..5a1258e002d2 100644
@@ -4,7 +4,6 @@
  * Author: Tim Harvey <[email protected]>
  */
 
-#include <common.h>
 #include <hang.h>
 #include <log.h>
 #include <linux/delay.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx6/litesom.c +0 -0

imx/mx6/litesom.c index 2ba3245e226c..ab5de2665778 100644

arch/arm/mach-imx/mx6/litesom.c +1 -1
@@ -17,7 +17,7 @@
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/io.h>
-#include <common.h>
+#include <config.h>
 #include <fsl_esdhc_imx.h>
 #include <linux/delay.h>
 #include <linux/sizes.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx6/module_fuse.c +0 -0

imx/mx6/module_fuse.c
index b58f11c1e562..8b23d48a854c 100644

arch/arm/mach-imx/mx6/module_fuse.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
 #include <fdt_support.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
arch/arm/mach-imx/mx6/mp.c +0 -1
index de9ace083ce8..091a37238316 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <linux/errno.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx6/opos6ul.c +0 -0

imx/mx6/opos6ul.c index 38ead8ace20c..340e6147b638 100644

arch/arm/mach-imx/mx6/opos6ul.c +1 -1
@@ -10,7 +10,7 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
-#include <common.h>
+#include <config.h>
 #include <env.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/arm/mach-imx/mx6/soc.c +0 -1
index c2875e727c94..3a3e01f3d0aa 100644
@@ -7,7 +7,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <env.h>
 #include <init.h>
 #include <linux/delay.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx7/clock.c +0 -0

imx/mx7/clock.c index 4e232385afc3..a8606fa9b24b 100644

arch/arm/mach-imx/mx7/clock.c +2 -1
@@ -6,11 +6,12 @@
  *	Peng Fan <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <command.h>
 #include <div64.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/errno.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx7/clock_slice.c +0 -0

imx/mx7/clock_slice.c
index dd731d949621..2a1304fc1128 100644

arch/arm/mach-imx/mx7/clock_slice.c +0 -1
@@ -6,7 +6,6 @@
  *	Peng Fan <[email protected]>
  */
 
-#include <common.h>
 #include <div64.h>
 #include <asm/io.h>
 #include <linux/errno.h>
arch/arm/mach-imx/mx7/ddr.c +0 -1
index cf25569765ea..c4a90be3945b 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx7-ddr.h>
-#include <common.h>
 #include <linux/delay.h>
 
 /*
arch/arm/mach- renamed from arch/arm/mach-imx/mx7/psci-mx7.c +0 -0

imx/mx7/psci-mx7.c
index 0b71fa403446..12d6a63b9255 100644

arch/arm/mach-imx/mx7/psci-mx7.c +0 -1
@@ -13,7 +13,6 @@
 #include <asm/armv7.h>
 #include <asm/gic.h>
 #include <linux/bitops.h>
-#include <common.h>
 #include <fsl_wdog.h>
 
 #define GPC_LPCR_A7_BSC	0x0
arch/arm/mach-imx/mx7/soc.c +0 -1
index 689dbefe8ee0..16c77cbf7bee 100644
@@ -4,7 +4,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx7ulp/clock.c +0 -0

imx/mx7ulp/clock.c
index 37d8565c20fc..fb19c62a5200 100644

arch/arm/mach-imx/mx7ulp/clock.c +1 -1
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <command.h>
 #include <div64.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx7ulp/iomux.c +0 -0

imx/mx7ulp/iomux.c
index 05ddeed2a64b..2c87a8c18b96 100644

arch/arm/mach-imx/mx7ulp/iomux.c +0 -1
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx7ulp/pcc.c +0 -0

imx/mx7ulp/pcc.c index aa7ea86a443e..0bfd8f71815a 100644

arch/arm/mach-imx/mx7ulp/pcc.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <div64.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx7ulp/scg.c +0 -0

imx/mx7ulp/scg.c index 4c066557c1ca..d4fb5389cacb 100644

arch/arm/mach-imx/mx7ulp/scg.c +1 -1
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <div64.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/mach- renamed from arch/arm/mach-imx/mx7ulp/soc.c +0 -0

imx/mx7ulp/soc.c index 217b7c45867d..198ae2d919c9 100644

arch/arm/mach-imx/mx7ulp/soc.c +1 -1
@@ -4,7 +4,7 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-imx/priblob.c +0 -1
index 5b022d5c8201..65924483bc89 100644
@@ -11,7 +11,6 @@
  */
 
 #include <asm/io.h>
-#include <common.h>
 #include <command.h>
 #include <fsl_sec.h>
 
arch/arm/mach-imx/rdc-sema.c +0 -1
index e683673753e1..56725cc109f0 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  */
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/rdc-sema.h>
arch/arm/mach-imx/speed.c index renamed from arch/arm/mach-imx/speed.c +0 -0

0e81cc880a1a..98a42b22f9cc 100644

arch/arm/mach-imx/speed.c +1 -1
@@ -7,7 +7,7 @@
  * TsiChung Liew ([email protected])
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
arch/arm/mach-imx/spl.c index renamed from arch/arm/mach-imx/spl.c +0 -0

b30cd9625538..bc291dcd1296 100644

arch/arm/mach-imx/spl.c +1 -1
@@ -6,7 +6,7 @@
  * Author: Tim Harvey <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach- renamed from arch/arm/mach-imx/spl_imx_romapi.c +0 -0

imx/spl_imx_romapi.c
index b9ff9bb83b3c..9a86f5c133f7 100644

arch/arm/mach-imx/spl_imx_romapi.c +0 -1
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
 #include <errno.h>
 #include <image.h>
 #include <imx_container.h>
arch/arm/mach- renamed from arch/arm/mach-imx/syscounter.c +0 -0

imx/syscounter.c index 16df1186759e..922f851c56b7 100644

arch/arm/mach-imx/syscounter.c +1 -1
@@ -5,7 +5,7 @@
  * The file use ls102xa/timer.c as a reference.
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/mach-imx/timer.c index renamed from arch/arm/mach-imx/timer.c +0 -0

fcd45f09f181..5ac8f28e670d 100644

arch/arm/mach-imx/timer.c +0 -1
@@ -6,7 +6,6 @@
  * (C) Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/io.h>
arch/arm/mach-imx/video.c index renamed from arch/arm/mach-imx/video.c +0 -0

1bc9b7cc7e15..6cbb49da53cc 100644

arch/arm/mach-imx/video.c +2 -2
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
+#include <stdio.h>
 #include <env.h>
 #include <linux/errno.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/mach-imx/video.h>
 
 #ifdef CONFIG_IMX_HDMI
--

2.34.1

author
#28 lore raw

PATCH 24/33 arm: histb: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-histb files and when needed add missing include files directly.

---
Cc: Peter Griffin <[email protected]>
Cc: Manivannan Sadhasivam <[email protected]>

---
 arch/arm/mach-histb/board_common.c | 1 -
 arch/arm/mach-histb/sysmap-histb.c | 1 -
 2 files changed, 2 deletions(-)
arch/arm/mach-histb/board_common.c +0 -1
index a26c2066e028..84d02c9aca21 100644
@@ -5,7 +5,6 @@
  * (C) Copyright 2023 Yang Xiwen <[email protected]>
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/system.h>
arch/arm/mach-histb/sysmap-histb.c +0 -1
index 83a2bb941799..76414558379f 100644
@@ -5,7 +5,6 @@
  * (C) Copyright 2023 Yang Xiwen <[email protected]>
  */
 
-#include <common.h>
 #include <asm/armv8/mmu.h>
 
 static struct mm_region histb_mem_map[] = {
Signature · 1 line
2.34.1
author
#29 lore raw

PATCH 25/33 arm: highbank: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-highbank files and when needed add missing include files directly.

---
 arch/arm/mach-highbank/timer.c | 1 -
 1 file changed, 1 deletion(-)
arch/arm/mach-highbank/timer.c +0 -1
index 2423a0e37855..32ec6f0ac0e2 100644
@@ -5,7 +5,6 @@
  * Based on arm926ejs/mx27/timer.c
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch-armv7/systimer.h>
Signature · 1 line
2.34.1
author
#30 lore raw

PATCH 26/33 arm: exynos: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-exynos files and when needed add missing include files directly.

---
Cc: Minkyu Kang <[email protected]>

---
 arch/arm/mach-exynos/clock.c              | 3 ++-
 arch/arm/mach-exynos/clock_init_exynos4.c | 1 -
 arch/arm/mach-exynos/clock_init_exynos5.c | 1 -
 arch/arm/mach-exynos/common_setup.h       | 2 ++
 arch/arm/mach-exynos/dmc_common.c         | 2 +-
 arch/arm/mach-exynos/dmc_init_ddr3.c      | 1 -
 arch/arm/mach-exynos/exynos5_setup.h      | 1 +
 arch/arm/mach-exynos/include/mach/power.h | 2 ++
 arch/arm/mach-exynos/lowlevel_init.c      | 1 -
 arch/arm/mach-exynos/mmu-arm64.c          | 1 -
 arch/arm/mach-exynos/pinmux.c             | 1 -
 arch/arm/mach-exynos/power.c              | 2 +-
 arch/arm/mach-exynos/soc.c                | 1 -
 arch/arm/mach-exynos/spl_boot.c           | 1 -
 arch/arm/mach-exynos/system.c             | 2 +-
 arch/arm/mach-exynos/tzpc.c               | 2 +-
 16 files changed, 11 insertions(+), 13 deletions(-)
arch/arm/mach-exynos/clock.c +2 -1
index f91f2ee862de..ee71b95237df 100644
@@ -4,9 +4,10 @@
  * Minkyu Kang <[email protected]>
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <log.h>
+#include <time.h>
+#include <mach/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
arch/arm/mach-exynos/clock_init_exynos4.c +0 -1
index 584e4bac09fc..95ed1956a077 100644
@@ -23,7 +23,6 @@
  * MA 02111-1307 USA
  */
 
-#include <common.h>
 #include <config.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
arch/arm/mach-exynos/clock_init_exynos5.c +0 -1
index 1cb8d391e7c9..232a2482dc65 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2012 Samsung Electronics
  */
 
-#include <common.h>
 #include <config.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
arch/arm/mach-exynos/common_setup.h +2 -0
index d7f02231fdfa..4f56160ee50a 100644
@@ -23,6 +23,8 @@
  * MA 02111-1307 USA
  */
 
+#include <linux/types.h>
+#include <mach/cpu.h>
 #include <asm/arch/system.h>
 
 #define DMC_OFFSET	0x10000
arch/arm/mach-exynos/dmc_common.c +1 -1
index 44923dd5520f..a96ded443b9a 100644
@@ -5,7 +5,7 @@
  * Copyright (C) 2012 Samsung Electronics
  */
 
-#include <common.h>
+#include <linux/types.h>
 #include <asm/arch/spl.h>
 
 #include "clock_init.h"
arch/arm/mach-exynos/dmc_init_ddr3.c +0 -1
index cad8ccc5315f..193de4c3a595 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2012 Samsung Electronics
  */
 
-#include <common.h>
 #include <config.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
arch/arm/mach-exynos/exynos5_setup.h +1 -0
index e9874a8c1b24..4e508edba0c6 100644
@@ -8,6 +8,7 @@
 #ifndef _SMDK5250_SETUP_H
 #define _SMDK5250_SETUP_H
 
+#include <linux/types.h>
 #include <asm/arch/dmc.h>
 
 #define NOT_AVAILABLE		0
arch/arm/mach-exynos/include/mach/power.h +2 -0
index a3d8974dcb5b..757e1586bde4 100644
@@ -8,6 +8,8 @@
 #define __ASM_ARM_ARCH_POWER_H_
 
 #ifndef __ASSEMBLY__
+#include <linux/types.h>
+
 struct exynos4_power {
 	unsigned int	om_stat;
 	unsigned char	res1[0x8];
arch/arm/mach-exynos/lowlevel_init.c +0 -1
index c57b8aee7989..0967ab995a93 100644
@@ -23,7 +23,6 @@
  * MA 02111-1307 USA
  */
 
-#include <common.h>
 #include <config.h>
 #include <debug_uart.h>
 #include <asm/system.h>
arch/arm/mach-exynos/mmu-arm64.c +0 -1
index 30e522804fbf..e2f32547adfc 100644
@@ -4,7 +4,6 @@
  * Thomas Abraham <[email protected]>
  */
 
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
 
arch/arm/mach-exynos/pinmux.c +0 -1
index ad3fbf2da7a8..4061dd4aafae 100644
@@ -4,7 +4,6 @@
  * Abhilash Kesavan <[email protected]>
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/gpio.h>
arch/arm/mach-exynos/power.c +1 -1
index f2a6c00dd629..599d3ccff603 100644
@@ -4,7 +4,7 @@
  * Donghwa Lee <[email protected]>
  */
 
-#include <common.h>
+#include <mach/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/power.h>
 
arch/arm/mach-exynos/soc.c +0 -1
index aff2b5e1b6e8..be18f181a7aa 100644
@@ -4,7 +4,6 @@
  * Minkyu Kang <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <asm/io.h>
arch/arm/mach-exynos/spl_boot.c +0 -1
index 553dac75b61d..bd5a06447b9c 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2012 Samsung Electronics
  */
 
-#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-exynos/system.c +1 -1
index 12d0d8fd34a6..f5090613c0d8 100644
@@ -4,7 +4,7 @@
  * Donghwa Lee <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <asm/arch/system.h>
 
arch/arm/mach-exynos/tzpc.c +1 -1
index abe8e7f45898..320a0cf35136 100644
@@ -5,7 +5,7 @@
  * Copyright (C) 2012 Samsung Electronics
  */
 
-#include <common.h>
+#include <mach/cpu.h>
 #include <asm/arch/tzpc.h>
 #include <asm/io.h>
 
Signature · 1 line
2.34.1
author
#31 lore raw

PATCH 27/33 arm: davinci: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-davinci files and when needed add missing include files directly.

---
 arch/arm/include/asm/ti-common/davinci_nand.h     | 1 +
 arch/arm/mach-davinci/cpu.c                       | 3 ++-
 arch/arm/mach-davinci/da850_lowlevel.c            | 2 +-
 arch/arm/mach-davinci/da850_pinmux.c              | 1 -
 arch/arm/mach-davinci/include/mach/davinci_misc.h | 1 +
 arch/arm/mach-davinci/misc.c                      | 3 ++-
 arch/arm/mach-davinci/pinmux.c                    | 1 -
 arch/arm/mach-davinci/psc.c                       | 1 -
 arch/arm/mach-davinci/reset.c                     | 1 -
 arch/arm/mach-davinci/spl.c                       | 1 -
 arch/arm/mach-davinci/timer.c                     | 2 +-
 11 files changed, 8 insertions(+), 9 deletions(-)
arch/arm/include/asm/ti-common/davinci_nand.h +1 -0
index 38a1a6ea0d7b..84fe01e3b712 100644
@@ -9,6 +9,7 @@
 #ifndef _DAVINCI_NAND_H_
 #define _DAVINCI_NAND_H_
 
+#include <config.h>
 #include <asm/arch/hardware.h>
 
 #define NAND_READ_START		0x00
arch/arm/mach-davinci/cpu.c +2 -1
index dae60262f5b7..033411235391 100644
@@ -4,11 +4,12 @@
  * Copyright (C) 2009 David Brownell
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <init.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/arm/mach-davinci/da850_lowlevel.c +1 -1
index 08c8f5925243..936b5e116679 100644
@@ -5,7 +5,7 @@
  * Copyright (C) 2011
  * Heiko Schocher, DENX Software Engineering, [email protected].
  */
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <nand.h>
 #include <ns16550.h>
arch/arm/mach-davinci/da850_pinmux.c +0 -1
index f2536c8dd6d6..4ee3cd0d5b34 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2011 OMICRON electronics GmbH
  */
 
-#include <common.h>
 #include <asm/arch/davinci_misc.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pinmux_defs.h>
arch/arm/mach-davinci/include/mach/davinci_misc.h +1 -0
index 1133a23bdee3..0d0ad1e593e1 100644
@@ -6,6 +6,7 @@
 #ifndef __MISC_H
 #define __MISC_H
 
+#include <linux/types.h>
 #include <asm/arch/hardware.h>
 
 /* pin muxer definitions */
arch/arm/mach-davinci/misc.c +2 -1
index cfad28c43d0a..93a144757a9e 100644
@@ -8,7 +8,7 @@
  * Copyright (C) 2004 Texas Instruments.
  */
 
-#include <common.h>
+#include <config.h>
 #include <env.h>
 #include <i2c.h>
 #include <init.h>
@@ -16,6 +16,7 @@
 #include <net.h>
 #include <asm/arch/hardware.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
 
arch/arm/mach-davinci/pinmux.c +0 -1
index 7904257b4a42..5ecb434b03b6 100644
@@ -8,7 +8,6 @@
  * Copyright (C) 2004 Texas Instruments.
  */
 
-#include <common.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/davinci_misc.h>
arch/arm/mach-davinci/psc.c +0 -1
index dae10aa03bbb..90b817860a62 100644
@@ -7,7 +7,6 @@
  * Copyright (C) 2004 Texas Instruments.
  */
 
-#include <common.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
 
arch/arm/mach-davinci/reset.c +0 -1
index 0d59eb6e3cef..e3e2c56a6760 100644
@@ -6,7 +6,6 @@
  * Copyright (C) 2007 Sergey Kubushyn <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/timer_defs.h>
arch/arm/mach-davinci/spl.c +0 -1
index 5f5b9ebbf97a..4603c8fbc575 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2011
  * Heiko Schocher, DENX Software Engineering, [email protected].
  */
-#include <common.h>
 #include <config.h>
 #include <hang.h>
 #include <init.h>
arch/arm/mach-davinci/timer.c +1 -1
index 83c190b620e7..f2990f718773 100644
@@ -20,7 +20,7 @@
  * Copyright (C) 2007 Sergey Kubushyn <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
Signature · 1 line
2.34.1
author
#32 lore raw

PATCH 28/33 arm: bcm: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-bcmbca, mach-bcm283x and bcm* CPU directory files and when needed add missing include files directly.

---
 arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c | 1 -
 arch/arm/cpu/armv7/bcm235xx/clk-bsc.c      | 1 -
 arch/arm/cpu/armv7/bcm235xx/clk-core.c     | 1 -
 arch/arm/cpu/armv7/bcm235xx/clk-eth.c      | 1 -
 arch/arm/cpu/armv7/bcm235xx/clk-sdio.c     | 1 -
 arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c  | 1 -
 arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c | 1 -
 arch/arm/cpu/armv7/bcm281xx/clk-bsc.c      | 1 -
 arch/arm/cpu/armv7/bcm281xx/clk-core.c     | 1 -
 arch/arm/cpu/armv7/bcm281xx/clk-eth.c      | 1 -
 arch/arm/cpu/armv7/bcm281xx/clk-sdio.c     | 1 -
 arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c  | 1 -
 arch/arm/cpu/armv7/bcm281xx/reset.c        | 1 -
 arch/arm/cpu/armv7/bcmcygnus/reset.c       | 1 -
 arch/arm/cpu/armv7/bcmnsp/reset.c          | 1 -
 arch/arm/mach-bcm283x/init.c               | 1 -
 arch/arm/mach-bcm283x/mbox.c               | 2 +-
 arch/arm/mach-bcm283x/msg.c                | 1 -
 arch/arm/mach-bcm283x/reset.c              | 2 +-
 arch/arm/mach-bcmbca/bcm4908/mmu_table.c   | 1 -
 arch/arm/mach-bcmbca/bcm4912/mmu_table.c   | 1 -
 arch/arm/mach-bcmbca/bcm63146/mmu_table.c  | 1 -
 arch/arm/mach-bcmbca/bcm63158/mmu_table.c  | 1 -
 arch/arm/mach-bcmbca/bcm6813/mmu_table.c   | 1 -
 arch/arm/mach-bcmbca/bcm6856/mmu_table.c   | 1 -
 arch/arm/mach-bcmbca/bcm6858/mmu_table.c   | 1 -
 26 files changed, 2 insertions(+), 26 deletions(-)
arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c +0 -1
index 39217c5b2bf1..7f73f893458b 100644
@@ -9,7 +9,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
arch/arm/cpu/armv7/bcm235xx/clk-bsc.c +0 -1
index 1b3f36aebe11..55dcc2fd78ca 100644
@@ -3,7 +3,6 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
arch/arm/cpu/armv7/bcm235xx/clk-core.c +0 -1
index d7edefee2318..b769c451105f 100644
@@ -9,7 +9,6 @@
  *
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>
arch/arm/cpu/armv7/bcm235xx/clk-eth.c +0 -1
index 209ceca9a06e..5f7cc4a102d0 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
arch/arm/cpu/armv7/bcm235xx/clk-sdio.c +0 -1
index f2ba354c24f8..f3ff29bebe85 100644
@@ -3,7 +3,6 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c +0 -1
index f604aec62fa6..87918059408c 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c +0 -1
index 8f6260e7857e..b258fea45c8e 100644
@@ -9,7 +9,6 @@
  *
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
arch/arm/cpu/armv7/bcm281xx/clk-bsc.c +0 -1
index 1b3f36aebe11..55dcc2fd78ca 100644
@@ -3,7 +3,6 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
arch/arm/cpu/armv7/bcm281xx/clk-core.c +0 -1
index 26b673a5405e..3f2e021a307c 100644
@@ -9,7 +9,6 @@
  *
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>
arch/arm/cpu/armv7/bcm281xx/clk-eth.c +0 -1
index 209ceca9a06e..5f7cc4a102d0 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
arch/arm/cpu/armv7/bcm281xx/clk-sdio.c +0 -1
index f2ba354c24f8..f3ff29bebe85 100644
@@ -3,7 +3,6 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c +0 -1
index f604aec62fa6..87918059408c 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
arch/arm/cpu/armv7/bcm281xx/reset.c +0 -1
index 1491e5c88b20..87e4337be4e0 100644
@@ -3,7 +3,6 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/sysmap.h>
arch/arm/cpu/armv7/bcmcygnus/reset.c +0 -1
index 63992fd87018..617c8d68a2a9 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 
arch/arm/cpu/armv7/bcmnsp/reset.c +0 -1
index a3137752e886..c3be33124c6a 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 
arch/arm/mach-bcm283x/init.c +0 -1
index 016bc1eb4129..1b459707bc63 100644
@@ -6,7 +6,6 @@
  * project.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <dm/device.h>
arch/arm/mach-bcm283x/mbox.c +1 -1
index da9faafe1ddc..c7cbfa72ffcc 100644
@@ -3,9 +3,9 @@
  * (C) Copyright 2012 Stephen Warren
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/base.h>
arch/arm/mach-bcm283x/msg.c +0 -1
index 2188b38d84b4..4993c0bdb819 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2012 Stephen Warren
  */
 
-#include <common.h>
 #include <memalign.h>
 #include <phys2bus.h>
 #include <asm/arch/mbox.h>
arch/arm/mach-bcm283x/reset.c +1 -1
index f13ac0c63757..9199234917f7 100644
@@ -6,7 +6,7 @@
  * project.
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/base.h>
arch/arm/mach-bcmbca/bcm4908/mmu_table.c +0 -1
index 5ab04083cc6c..ca403bae9912 100644
@@ -2,7 +2,6 @@
 /*
  *  Copyright 2022 Broadcom Ltd.
  */
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
 
arch/arm/mach-bcmbca/bcm4912/mmu_table.c +0 -1
index 52a53a2c76d0..b11effe06678 100644
@@ -2,7 +2,6 @@
 /*
  *  Copyright 2022 Broadcom Ltd.
  */
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
 
arch/arm/mach-bcmbca/bcm63146/mmu_table.c +0 -1
index c6b7a54fbdfa..a883e74ac005 100644
@@ -2,7 +2,6 @@
 /*
  *  Copyright 2022 Broadcom Ltd.
  */
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
 
arch/arm/mach-bcmbca/bcm63158/mmu_table.c +0 -1
index fe7efb30e22b..eb3cc3e5aec2 100644
@@ -2,7 +2,6 @@
 /*
  *  Copyright 2022 Broadcom Ltd.
  */
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
 
arch/arm/mach-bcmbca/bcm6813/mmu_table.c +0 -1
index eb736bf7d508..458624e87aa9 100644
@@ -2,7 +2,6 @@
 /*
  *  Copyright 2022 Broadcom Ltd.
  */
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
 
arch/arm/mach-bcmbca/bcm6856/mmu_table.c +0 -1
index 8e53b4929eb8..83c07727573a 100644
@@ -2,7 +2,6 @@
 /*
  *  Copyright 2022 Broadcom Ltd.
  */
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
 
arch/arm/mach-bcmbca/bcm6858/mmu_table.c +0 -1
index 898291075f5e..82aba326dcb3 100644
@@ -2,7 +2,6 @@
 /*
  *  Copyright 2022 Broadcom Ltd.
  */
-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <linux/sizes.h>
 
Signature · 1 line
2.34.1
author
#33 lore raw

PATCH 29/33 arm: at91: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-at91 files and when needed add missing include files directly.

---
Cc: Eugen Hristev <[email protected]>

---
 arch/arm/mach-at91/arm920t/at91rm9200_devices.c       | 1 -
 arch/arm/mach-at91/arm920t/clock.c                    | 2 +-
 arch/arm/mach-at91/arm920t/cpu.c                      | 2 +-
 arch/arm/mach-at91/arm920t/reset.c                    | 1 -
 arch/arm/mach-at91/arm920t/timer.c                    | 2 +-
 arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c    | 1 -
 arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c    | 1 -
 arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c    | 1 -
 arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c | 1 -
 arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c    | 1 -
 arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c     | 1 -
 arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c     | 1 -
 arch/arm/mach-at91/arm926ejs/clock.c                  | 3 ++-
 arch/arm/mach-at91/arm926ejs/cpu.c                    | 2 +-
 arch/arm/mach-at91/arm926ejs/eflash.c                 | 1 -
 arch/arm/mach-at91/arm926ejs/reset.c                  | 1 -
 arch/arm/mach-at91/arm926ejs/sam9x60_devices.c        | 1 -
 arch/arm/mach-at91/arm926ejs/timer.c                  | 1 -
 arch/arm/mach-at91/armv7/clock.c                      | 2 +-
 arch/arm/mach-at91/armv7/cpu.c                        | 2 +-
 arch/arm/mach-at91/armv7/sama5d2_devices.c            | 1 -
 arch/arm/mach-at91/armv7/sama5d3_devices.c            | 1 -
 arch/arm/mach-at91/armv7/sama5d4_devices.c            | 1 -
 arch/arm/mach-at91/armv7/timer.c                      | 1 -
 arch/arm/mach-at91/atmel_sfr.c                        | 2 +-
 arch/arm/mach-at91/clock.c                            | 2 +-
 arch/arm/mach-at91/include/mach/at91_common.h         | 2 ++
 arch/arm/mach-at91/matrix.c                           | 1 -
 arch/arm/mach-at91/mpddrc.c                           | 1 -
 arch/arm/mach-at91/phy.c                              | 2 +-
 arch/arm/mach-at91/sdram.c                            | 1 -
 arch/arm/mach-at91/spl.c                              | 1 -
 arch/arm/mach-at91/spl_at91.c                         | 2 +-
 arch/arm/mach-at91/spl_atmel.c                        | 2 +-
 34 files changed, 15 insertions(+), 33 deletions(-)
arch/arm/mach-at91/arm920t/at91rm9200_devices.c +0 -1
index c849885bc2bb..459edadb5876 100644
@@ -10,7 +10,6 @@
  * Lead Tech Design <www.leadtechdesign.com>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
arch/arm/mach-at91/arm920t/clock.c +1 -1
index 09ac66d619d2..ac55a61be647 100644
@@ -7,7 +7,7 @@
  * Copyright (C) 2005 Ivan Kokshaysky
  * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
  */
-#include <common.h>
+#include <config.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-at91/arm920t/cpu.c +1 -1
index 9bf03fd68ecc..579e76b339d8 100644
@@ -10,7 +10,7 @@
  * Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-at91/arm920t/reset.c +0 -1
index 91e375146ad7..7582cef417ff 100644
@@ -13,7 +13,6 @@
  * Alex Zuepke <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-at91/arm920t/timer.c +1 -1
index 8ef5764e3153..f7b4116344ca 100644
@@ -13,7 +13,7 @@
  * Alex Zuepke <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/mach-at91/arm926ejs/at91sam9260_devices.c +0 -1
index c10571fa28a0..201c99ade4ec 100644
@@ -5,7 +5,6 @@
  * Lead Tech Design <www.leadtechdesign.com>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9260_matrix.h>
arch/arm/mach-at91/arm926ejs/at91sam9261_devices.c +0 -1
index 0c2b9f2ecc9b..b8d209cbec84 100644
@@ -5,7 +5,6 @@
  * Lead Tech Design <www.leadtechdesign.com>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
arch/arm/mach-at91/arm926ejs/at91sam9263_devices.c +0 -1
index 3b8a4623866c..1749662dae9c 100644
@@ -9,7 +9,6 @@
  * esd electronic system design gmbh <www.esd.eu>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
arch/arm/mach-at91/arm926ejs/at91sam9m10g45_devices.c +0 -1
index d517810c991a..4c481484c3d2 100644
@@ -5,7 +5,6 @@
  * Lead Tech Design <www.leadtechdesign.com>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
arch/arm/mach-at91/arm926ejs/at91sam9n12_devices.c +0 -1
index 9f98ce7a45ca..4dc6e51aba83 100644
@@ -4,7 +4,6 @@
  * Josh Wu <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pio.h>
arch/arm/mach-at91/arm926ejs/at91sam9rl_devices.c +0 -1
index b4002eb75046..4f5bafb8c2e8 100644
@@ -5,7 +5,6 @@
  * Lead Tech Design <www.leadtechdesign.com>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
arch/arm/mach-at91/arm926ejs/at91sam9x5_devices.c +0 -1
index f44760bed31b..40c8a58b5635 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2012 Atmel Corporation
  */
 
-#include <common.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
arch/arm/mach-at91/arm926ejs/clock.c +2 -1
index 013daf43b742..241de6a53788 100644
@@ -7,7 +7,8 @@
  * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-at91/arm926ejs/cpu.c +1 -1
index 5e84b0a40e13..e476cd5bcf3d 100644
@@ -6,7 +6,7 @@
  * Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <vsprintf.h>
 #include <asm/io.h>
arch/arm/mach-at91/arm926ejs/eflash.c +0 -1
index aade13cc014b..bb66700566e5 100644
@@ -42,7 +42,6 @@
  *	someone puts a jffs2 into them)
  * do a read-modify-write for partially programmed pages
  */
-#include <common.h>
 #include <display_options.h>
 #include <flash.h>
 #include <log.h>
arch/arm/mach-at91/arm926ejs/reset.c +0 -1
index 6acbfa33011d..01b2663f96c9 100644
@@ -5,7 +5,6 @@
  * Lead Tech Design <www.leadtechdesign.com>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-at91/arm926ejs/sam9x60_devices.c +0 -1
index e3d3dd880cad..97c572deaaf0 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018 Microchip Technology Inc. and its subsidiaries
  */
 
-#include <common.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/gpio.h>
arch/arm/mach-at91/arm926ejs/timer.c +0 -1
index a8cf0e4bd799..137a5e5b8fd0 100644
@@ -5,7 +5,6 @@
  * Lead Tech Design <www.leadtechdesign.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/mach-at91/armv7/clock.c +1 -1
index 6bfa02d1d0a3..5357b4cffc2c 100644
@@ -9,7 +9,7 @@
  * Copyright (C) 2015 Wenyou Yang <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/global_data.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
arch/arm/mach-at91/armv7/cpu.c +1 -1
index 5ea7e2609f59..f4b2f4f351cb 100644
@@ -8,7 +8,7 @@
  * Bo Shen <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <vsprintf.h>
arch/arm/mach-at91/armv7/sama5d2_devices.c +0 -1
index edc20574c31b..469c22117665 100644
@@ -4,7 +4,6 @@
  *		      Wenyou Yang <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/sama5d2.h>
arch/arm/mach-at91/armv7/sama5d3_devices.c +0 -1
index 04b700a94d73..67b63208edaa 100644
@@ -4,7 +4,6 @@
  * Bo Shen <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/sama5d3.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
arch/arm/mach-at91/armv7/sama5d4_devices.c +0 -1
index e68ae9940788..76fff9cd466c 100644
@@ -4,7 +4,6 @@
  *		      Bo Shen <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/clk.h>
arch/arm/mach-at91/armv7/timer.c +0 -1
index 1f54c5dcad98..bfdb75ce39a9 100644
@@ -8,7 +8,6 @@
  * Bo Shen <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/mach-at91/atmel_sfr.c +1 -1
index 62108d2bd0a5..019ef930022f 100644
@@ -4,7 +4,7 @@
  *		      Wenyou Yang <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/at91_sfr.h>
arch/arm/mach-at91/clock.c +1 -1
index 8344daeb39a2..442b822fe77f 100644
@@ -4,8 +4,8 @@
  *		      Wenyou Yang <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
+#include <time.h>
 #include <wdt.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
arch/arm/mach-at91/include/mach/at91_common.h +2 -0
index f7b411cf7dfa..683e539b1b3c 100644
@@ -8,6 +8,8 @@
 #ifndef AT91_COMMON_H
 #define AT91_COMMON_H
 
+#include <linux/types.h>
+
 void at91_can_hw_init(void);
 void at91_gmac_hw_init(void);
 void at91_macb_hw_init(void);
arch/arm/mach-at91/matrix.c +0 -1
index 2fa8493a0bd6..3bef5648d4a1 100644
@@ -4,7 +4,6 @@
  *		      Wenyou Yang <[email protected]>
  */
 
-#include <common.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/sama5_matrix.h>
arch/arm/mach-at91/mpddrc.c +0 -1
index 5422c05456e0..ac6a719d9c08 100644
@@ -7,7 +7,6 @@
  *		      Wenyou Yang <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/atmel_mpddrc.h>
 #include <asm/arch/at91_common.h>
arch/arm/mach-at91/phy.c +1 -1
index f4484a77c7de..ec38f5bc9315 100644
@@ -11,7 +11,7 @@
  * Copyright (C) 2013 DENX Software Engineering, [email protected]
  */
 
-#include <common.h>
+#include <time.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <linux/delay.h>
arch/arm/mach-at91/sdram.c +0 -1
index 6638aa82bb64..be3e91c7dbad 100644
@@ -9,7 +9,6 @@
  * Lead Tech Design <www.leadtechdesign.com>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91sam9_sdramc.h>
arch/arm/mach-at91/spl.c +0 -1
index 8d537998c984..5feb8f735511 100644
@@ -4,7 +4,6 @@
  *		      Bo Shen <[email protected]>
  */
 
-#include <common.h>
 #include <hang.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
arch/arm/mach-at91/spl_at91.c +1 -1
index dfba9f730c12..cde1700a2839 100644
@@ -8,7 +8,7 @@
  *		      Bo Shen <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-at91/spl_atmel.c +1 -1
index a30c4f6c075f..62a7df8a195f 100644
@@ -4,7 +4,7 @@
  *		      Bo Shen <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <hang.h>
 #include <init.h>
 #include <log.h>
Signature · 1 line
2.34.1
author
#34 lore raw

PATCH 30/33 arm: aspeed: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-aspeed files and when needed add missing include files directly.

---
Cc: Ryan Chen <[email protected]>
Cc: Chia-Wei Wang <[email protected]>
Cc: Aspeed BMC SW team <[email protected]>
Cc: Joel Stanley <[email protected]>

---
 arch/arm/mach-aspeed/ast2500/board_common.c | 2 +-
 arch/arm/mach-aspeed/ast2500/clk_ast2500.c  | 1 -
 arch/arm/mach-aspeed/ast2600/board_common.c | 2 +-
 arch/arm/mach-aspeed/ast2600/spl.c          | 1 -
 arch/arm/mach-aspeed/ast_wdt.c              | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/mach-aspeed/ast2500/board_common.c +1 -1
index bae10271844a..531c2ad1562c 100644
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2016 Google, Inc
  */
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
arch/arm/mach-aspeed/ast2500/clk_ast2500.c +0 -1
index 02bd3f67c96a..50d7f99b2643 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/io.h>
 #include <asm/arch/scu_ast2500.h>
arch/arm/mach-aspeed/ast2600/board_common.c +1 -1
index dc6cdc35d15c..4c0b705ea88d 100644
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) Aspeed Technology Inc.
  */
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <ram.h>
 #include <timer.h>
arch/arm/mach-aspeed/ast2600/spl.c +0 -1
index 0952e73a4572..05390c16f3af 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (c) Aspeed Technology Inc.
  */
-#include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <spl.h>
arch/arm/mach-aspeed/ast_wdt.c +0 -1
index 5bc442ef33ce..c420940d1cb9 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2016 Google, Inc
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/arch/wdt.h>
 #include <linux/err.h>
Signature · 1 line
2.34.1
author
#36 lore raw

PATCH 31/33 arm: apple: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all mach-apple files and when needed add missing include files directly.

---
Cc: Mark Kettenis <[email protected]>

---
 arch/arm/mach-apple/board.c | 1 -
 arch/arm/mach-apple/rtkit.c | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-apple/board.c +0 -1
index 7a6151a97223..8bace3005eb5 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2021 Mark Kettenis <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/uclass-internal.h>
 #include <efi_loader.h>
arch/arm/mach-apple/rtkit.c +2 -1
index a550b553b663..b8f4771e5e71 100644
@@ -4,13 +4,14 @@
  * (C) Copyright 2021 Copyright The Asahi Linux Contributors
  */
 
-#include <common.h>
 #include <mailbox.h>
 #include <malloc.h>
 
 #include <asm/arch/rtkit.h>
 #include <linux/apple-mailbox.h>
 #include <linux/bitfield.h>
+#include <linux/errno.h>
+#include <linux/types.h>
 
 #define APPLE_RTKIT_EP_MGMT 0
 #define APPLE_RTKIT_EP_CRASHLOG	1
Signature · 1 line
2.34.1
author
#37 lore raw

PATCH 32/33 arm: fsl-layerscape: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all fsl-layerscape related files and when needed add missing include files directly.

---
Cc: Peng Fan <[email protected]>

---
 arch/arm/cpu/armv7/ls102xa/clock.c                     | 2 +-
 arch/arm/cpu/armv7/ls102xa/cpu.c                       | 1 -
 arch/arm/cpu/armv7/ls102xa/fdt.c                       | 2 +-
 arch/arm/cpu/armv7/ls102xa/fsl_epu.c                   | 1 -
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c            | 2 +-
 arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c            | 2 +-
 arch/arm/cpu/armv7/ls102xa/soc.c                       | 2 +-
 arch/arm/cpu/armv7/ls102xa/spl.c                       | 1 -
 arch/arm/cpu/armv7/ls102xa/timer.c                     | 1 -
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c   | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c    | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c   | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c    | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/icid.c               | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c         | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c     | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                 | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                | 2 +-
 arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h  | 2 ++
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 +
 arch/arm/include/asm/arch-ls102xa/fsl_serdes.h         | 2 ++
 35 files changed, 40 insertions(+), 32 deletions(-)
arch/arm/cpu/armv7/ls102xa/clock.c +1 -1
index 4e1fe281201f..e885a85ce65c 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
arch/arm/cpu/armv7/ls102xa/cpu.c +0 -1
index c455969609f6..74a2dcbc116a 100644
@@ -4,7 +4,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
arch/arm/cpu/armv7/ls102xa/fdt.c +1 -1
index 1c3d24bcad94..34eea22eb923 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <net.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv7/ls102xa/fsl_epu.c +0 -1
index e31a4fb6c31b..664eae532d5f 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/io.h>
 
 #include "fsl_epu.h"
arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c +1 -1
index f74d819ea1ea..c1eadb34523f 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <linux/errno.h>
arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c +1 -1
index 8c030be8b36f..3032e266c5d4 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <linux/kernel.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
 
arch/arm/cpu/armv7/ls102xa/soc.c +1 -1
index 84d4ea3a8f4a..7ff59edd452e 100644
@@ -3,7 +3,7 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
arch/arm/cpu/armv7/ls102xa/spl.c +0 -1
index a19496862359..374de92d026c 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <spl.h>
 
 u32 spl_boot_device(void)
arch/arm/cpu/armv7/ls102xa/timer.c +0 -1
index c6126b10c355..6f32ced5aec3 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -1
index 12d31184ad91..d2dbfdd08a02 100644
@@ -4,7 +4,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <env.h>
arch/arm/cpu/armv8/fsl-layerscape/fdt.c +1 -1
index 22ce6992165b..ca6be3626fbe 100644
@@ -4,7 +4,7 @@
  * Copyright 2020-2021 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <efi_loader.h>
 #include <log.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c +2 -1
index b1bb29bcaf55..78961d8089e4 100644
@@ -3,11 +3,12 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +1 -1
index 4455eb1726dc..9a24d4b30313 100644
@@ -4,7 +4,7 @@
  * Copyright 2019 NXP.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +1 -1
index fbd5fd7d433b..b768790437fd 100644
@@ -4,7 +4,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <env.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +1 -1
index 137778dc136b..452246e0e67f 100644
@@ -6,7 +6,7 @@
  * Derived from arch/power/cpu/mpc85xx/speed.c
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv8/fsl-layerscape/icid.c +1 -1
index c22e73253c3c..04ffefafbf73 100644
@@ -3,7 +3,7 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c +1 -1
index 8d7beca7db38..c0e5455507a4 100644
@@ -3,7 +3,7 @@
  * Copyright 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 
arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c +1 -1
index 86a49b152e44..d48baa63816f 100644
@@ -3,9 +3,9 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <asm/arch/stream_id_lsch3.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c +2 -1
index 80d2910f679f..1b4eab3613e5 100644
@@ -3,7 +3,8 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
+#include <linux/kernel.h>
 #include <asm/arch/fsl_serdes.h>
 
 struct serdes_config {
arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c +2 -1
index e3c3fc6bfb55..ec80e42055d9 100644
@@ -3,11 +3,12 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch2.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
 #include <fsl_sec.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c +1 -1
index 6c5e52ebaa69..1911ca1a175b 100644
@@ -3,7 +3,7 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 
arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c +2 -1
index 333d7e2fa21a..a73dd316f8d0 100644
@@ -3,10 +3,11 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch2.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = {
arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c +1 -1
index 9347e516bf69..26ca4ca10f3d 100644
@@ -4,7 +4,7 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 
arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c +2 -1
index 23743ae10cff..3a076ca04f6e 100644
@@ -3,10 +3,11 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c +1 -1
index fe667f06c395..154b727392e1 100644
@@ -3,7 +3,7 @@
  * Copyright 2017-2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c +1 -1
index 7997422840f2..5088c8ebb7ff 100644
@@ -3,7 +3,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 
 struct serdes_config {
arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c +2 -1
index e6403b795263..c320e835c996 100644
@@ -3,10 +3,11 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c +2 -1
index 3a0ed1fa550c..df9329df77e1 100644
@@ -3,10 +3,11 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID),
arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c +1 -1
index 5941d90e036f..43f0e8c87ba9 100644
@@ -3,7 +3,7 @@
  * Copyright 2018, 2020 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 
 struct serdes_config {
arch/arm/cpu/armv8/fsl-layerscape/mp.c +1 -1
index ce0c46ad0d4e..db913208b9e9 100644
@@ -3,7 +3,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <image.h>
arch/arm/cpu/armv8/fsl-layerscape/soc.c +1 -1
index 4c61d28c20f0..d85a630f8a3c 100644
@@ -4,7 +4,7 @@
  * Copyright 2019-2021 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <env.h>
arch/arm/cpu/armv8/fsl-layerscape/spl.c +1 -1
index 232adfa843a2..a739ff2da581 100644
@@ -3,7 +3,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h +2 -0
index 9e29350ca4ba..a02bec9371c0 100644
@@ -7,6 +7,8 @@
 #ifndef __FSL_SERDES_H__
 #define __FSL_SERDES_H__
 
+#include <linux/types.h>
+
 #ifdef CONFIG_FSL_LSCH3
 enum srds_prtcl {
 	/*
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +1 -0
index 9794db044996..147ca2f99de6 100644
@@ -6,6 +6,7 @@
 #ifndef __ARCH_FSL_LSCH2_IMMAP_H__
 #define __ARCH_FSL_LSCH2_IMMAP_H__
 
+#include <config.h>
 #include <fsl_immap.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
arch/arm/include/asm/arch-ls102xa/fsl_serdes.h +2 -0
index 9244e0a78fd3..35e3ec7a9878 100644
@@ -6,6 +6,8 @@
 #ifndef __FSL_SERDES_H
 #define __FSL_SERDES_H
 
+#include <linux/types.h>
+
 enum srds_prtcl {
 	/*
 	 * Nobody will check whether the device 'NONE' has been configured,
Signature · 1 line
2.34.1
Acked-by on v1 32/33
#38 lore raw

RE: [PATCH 32/33] arm: fsl-layerscape: Remove <common.h> and add needed includes

Quoted 7 lines

Subject: [PATCH 32/33] arm: fsl-layerscape: Remove <common.h> and add needed includes

Remove <common.h> from all fsl-layerscape related files and when needed add missing include files directly.

Quoted 556 lines

---
Cc: Peng Fan <[email protected]>

---
 arch/arm/cpu/armv7/ls102xa/clock.c                     | 2 +-
 arch/arm/cpu/armv7/ls102xa/cpu.c                       | 1 -
 arch/arm/cpu/armv7/ls102xa/fdt.c                       | 2 +-
 arch/arm/cpu/armv7/ls102xa/fsl_epu.c                   | 1 -
 arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c            | 2 +-
 arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c            | 2 +-
 arch/arm/cpu/armv7/ls102xa/soc.c                       | 2 +-
 arch/arm/cpu/armv7/ls102xa/spl.c                       | 1 -
 arch/arm/cpu/armv7/ls102xa/timer.c                     | 1 -
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c                | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fdt.c                | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c   | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c    | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c   | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c    | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/icid.c               | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c         | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c     | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c         | 3 ++-
 arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c     | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/mp.c                 | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/soc.c                | 2 +-
 arch/arm/cpu/armv8/fsl-layerscape/spl.c                | 2 +-
 arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h  | 2 ++
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 +
 arch/arm/include/asm/arch-ls102xa/fsl_serdes.h         | 2 ++
 35 files changed, 40 insertions(+), 32 deletions(-)
arch/arm/cpu/armv7/ls102xa/clock.c +1 -1
index 4e1fe281201f..e885a85ce65c 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
arch/arm/cpu/armv7/ls102xa/cpu.c +0 -1
index c455969609f6..74a2dcbc116a 100644
@@ -4,7 +4,6 @@
  * Copyright 2021 NXP
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <net.h>
arch/arm/cpu/armv7/ls102xa/fdt.c +1 -1
index 1c3d24bcad94..34eea22eb923 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <net.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv7/ls102xa/fsl_epu.c +0 -1
index e31a4fb6c31b..664eae532d5f 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/io.h>
 
 #include "fsl_epu.h"
arch/arm/cpu/armv7/ls102xa/fsl_ls1_serdes.c +1 -1
index f74d819ea1ea..c1eadb34523f 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
 #include <linux/errno.h>
arch/arm/cpu/armv7/ls102xa/ls102xa_serdes.c +1 -1
index 8c030be8b36f..3032e266c5d4 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <linux/kernel.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_ls102xa.h>
 
arch/arm/cpu/armv7/ls102xa/soc.c +1 -1
index 84d4ea3a8f4a..7ff59edd452e 100644
@@ -3,7 +3,7 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
arch/arm/cpu/armv7/ls102xa/spl.c +0 -1
index a19496862359..374de92d026c 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <spl.h>
 
 u32 spl_boot_device(void)
arch/arm/cpu/armv7/ls102xa/timer.c +0 -1
index c6126b10c355..6f32ced5aec3 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +1 -1
index 12d31184ad91..d2dbfdd08a02 100644
@@ -4,7 +4,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <env.h>
arch/arm/cpu/armv8/fsl-layerscape/fdt.c +1 -1
index 22ce6992165b..ca6be3626fbe 100644
@@ -4,7 +4,7 @@
  * Copyright 2020-2021 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <efi_loader.h>
 #include <log.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c +2 -1
index b1bb29bcaf55..78961d8089e4 100644
@@ -3,11 +3,12 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c +1 -1
index 4455eb1726dc..9a24d4b30313 100644
@@ -4,7 +4,7 @@
  * Copyright 2019 NXP.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c +1 -1
index fbd5fd7d433b..b768790437fd 100644
@@ -4,7 +4,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <env.h>
 #include <log.h>
 #include <asm/io.h>
arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c +1 -1
index 137778dc136b..452246e0e67f 100644
@@ -6,7 +6,7 @@
  * Derived from arch/power/cpu/mpc85xx/speed.c
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv8/fsl-layerscape/icid.c +1 -1
index c22e73253c3c..04ffefafbf73 100644
@@ -3,7 +3,7 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
arch/arm/cpu/armv8/fsl-layerscape/ls1012a_serdes.c +1 -1
index 8d7beca7db38..c0e5455507a4 100644
@@ -3,7 +3,7 @@
  * Copyright 2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 
arch/arm/cpu/armv8/fsl-layerscape/ls1028_ids.c +1 -1
index 86a49b152e44..d48baa63816f 100644
@@ -3,9 +3,9 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
 #include <fdt_support.h>
 #include <log.h>
+#include <asm/arch/stream_id_lsch3.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c +2 -1
index 80d2910f679f..1b4eab3613e5 100644
@@ -3,7 +3,8 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
+#include <linux/kernel.h>
 #include <asm/arch/fsl_serdes.h>
 
 struct serdes_config {
arch/arm/cpu/armv8/fsl-layerscape/ls1043_ids.c +2 -1
index e3c3fc6bfb55..ec80e42055d9 100644
@@ -3,11 +3,12 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch2.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
 #include <fsl_sec.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = { diff --git

a/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c index 6c5e52ebaa69..1911ca1a175b 100644

arch/arm/cpu/armv8/fsl-layerscape/ls1043a_serdes.c +1 -1
@@ -3,7 +3,7 @@
  * Copyright 2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 
arch/arm/cpu/armv8/fsl-layerscape/ls1046_ids.c +2 -1
index 333d7e2fa21a..a73dd316f8d0 100644
@@ -3,10 +3,11 @@
  * Copyright 2018 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch2.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CFG_SYS_QMAN_NUM_PORTALS] = { diff --git

a/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c index 9347e516bf69..26ca4ca10f3d 100644

arch/arm/cpu/armv8/fsl-layerscape/ls1046a_serdes.c +1 -1
@@ -4,7 +4,7 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/immap_lsch2.h>
 
arch/arm/cpu/armv8/fsl-layerscape/ls1088_ids.c +2 -1
index 23743ae10cff..3a076ca04f6e 100644
@@ -3,10 +3,11 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git

a/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c index fe667f06c395..154b727392e1 100644

arch/arm/cpu/armv8/fsl-layerscape/ls1088a_serdes.c +1 -1
@@ -3,7 +3,7 @@
  * Copyright 2017-2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
 #include <asm/io.h>
arch/arm/cpu/armv8/fsl-layerscape/ls2080a_serdes.c +1 -1
index 7997422840f2..5088c8ebb7ff 100644
@@ -3,7 +3,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 
 struct serdes_config {
arch/arm/cpu/armv8/fsl-layerscape/ls2088_ids.c +2 -1
index e6403b795263..c320e835c996 100644
@@ -3,10 +3,11 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git

a/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
b/arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c
index 3a0ed1fa550c..df9329df77e1 100644

arch/arm/cpu/armv8/fsl-layerscape/lx2160_ids.c +2 -1
@@ -3,10 +3,11 @@
  * Copyright 2019 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch-fsl-layerscape/immap_lsch3.h>
 #include <asm/arch-fsl-layerscape/fsl_icid.h>
 #include <asm/arch-fsl-layerscape/fsl_portals.h>
+#include <asm/arch/stream_id_lsch3.h>
 
 struct icid_id_table icid_tbl[] = {
 	SET_SDHC_ICID(1, FSL_SDMMC_STREAM_ID), diff --git

a/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c b/arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c index 5941d90e036f..43f0e8c87ba9 100644

arch/arm/cpu/armv8/fsl-layerscape/lx2160a_serdes.c +1 -1
@@ -3,7 +3,7 @@
  * Copyright 2018, 2020 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/arch/fsl_serdes.h>
 
 struct serdes_config {
arch/arm/cpu/armv8/fsl-layerscape/mp.c +1 -1
index ce0c46ad0d4e..db913208b9e9 100644
@@ -3,7 +3,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <image.h>
arch/arm/cpu/armv8/fsl-layerscape/soc.c +1 -1
index 4c61d28c20f0..d85a630f8a3c 100644
@@ -4,7 +4,7 @@
  * Copyright 2019-2021 NXP
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <env.h>
arch/arm/cpu/armv8/fsl-layerscape/spl.c +1 -1
index 232adfa843a2..a739ff2da581 100644
@@ -3,7 +3,7 @@
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
arch/arm/include/asm/arch-fsl-layerscape/fsl_serdes.h +2 -0
index 9e29350ca4ba..a02bec9371c0 100644
@@ -7,6 +7,8 @@
 #ifndef __FSL_SERDES_H__
 #define __FSL_SERDES_H__
 
+#include <linux/types.h>
+
 #ifdef CONFIG_FSL_LSCH3
 enum srds_prtcl {
 	/*
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +1 -0
index 9794db044996..147ca2f99de6 100644
@@ -6,6 +6,7 @@
 #ifndef __ARCH_FSL_LSCH2_IMMAP_H__
 #define __ARCH_FSL_LSCH2_IMMAP_H__
 
+#include <config.h>
 #include <fsl_immap.h>
 #ifndef __ASSEMBLY__
 #include <linux/bitops.h>
arch/arm/include/asm/arch-ls102xa/fsl_serdes.h +2 -1
index 9244e0a78fd3..35e3ec7a9878 100644
@@ -6,6 +6,8 @@
 #ifndef __FSL_SERDES_H
 #define __FSL_SERDES_H
 
+#include <linux/types.h>
+
 enum srds_prtcl {
 	/*
 	 * Nobody will check whether the device 'NONE' has been configured,
--

2.34.1

author
#39 lore raw

PATCH 33/33 arm: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from the remainder of the files under arch/arm and when needed add missing include files directly.

---
 arch/arm/cpu/arm11/cpu.c                        | 1 -
 arch/arm/cpu/arm720t/interrupts.c               | 2 +-
 arch/arm/cpu/arm920t/cpu.c                      | 1 -
 arch/arm/cpu/arm920t/start.S                    | 1 -
 arch/arm/cpu/arm926ejs/cache.c                  | 1 -
 arch/arm/cpu/arm926ejs/cpu.c                    | 1 -
 arch/arm/cpu/arm926ejs/start.S                  | 1 -
 arch/arm/cpu/arm946es/cpu.c                     | 1 -
 arch/arm/cpu/armv7/arch_timer.c                 | 2 +-
 arch/arm/cpu/armv7/cache_v7.c                   | 1 -
 arch/arm/cpu/armv7/cp15.c                       | 1 -
 arch/arm/cpu/armv7/cpu.c                        | 1 -
 arch/arm/cpu/armv7/exception_level.c            | 1 -
 arch/arm/cpu/armv7/iproc-common/armpll.c        | 1 -
 arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 1 -
 arch/arm/cpu/armv7/iproc-common/timer.c         | 1 -
 arch/arm/cpu/armv7/mpu_v7r.c                    | 1 -
 arch/arm/cpu/armv7/s5p4418/cpu.c                | 1 -
 arch/arm/cpu/armv7/syslib.c                     | 1 -
 arch/arm/cpu/armv7/vf610/generic.c              | 1 -
 arch/arm/cpu/armv7/vf610/timer.c                | 1 -
 arch/arm/cpu/armv7/virt-dt.c                    | 1 -
 arch/arm/cpu/armv7/virt-v7.c                    | 1 -
 arch/arm/cpu/armv7m/cache.c                     | 1 -
 arch/arm/cpu/armv7m/cpu.c                       | 1 -
 arch/arm/cpu/armv7m/systick-timer.c             | 2 +-
 arch/arm/cpu/armv8/cache_v8.c                   | 1 -
 arch/arm/cpu/armv8/cpu-dt.c                     | 1 -
 arch/arm/cpu/armv8/cpu.c                        | 1 -
 arch/arm/cpu/armv8/exception_level.c            | 1 -
 arch/arm/cpu/armv8/generic_timer.c              | 1 -
 arch/arm/cpu/armv8/hisilicon/pinmux.c           | 1 -
 arch/arm/cpu/armv8/sec_firmware.c               | 2 +-
 arch/arm/cpu/armv8/sha1_ce_glue.c               | 1 -
 arch/arm/cpu/armv8/sha256_ce_glue.c             | 1 -
 arch/arm/cpu/armv8/spin_table.c                 | 1 -
 arch/arm/cpu/armv8/spl_data.c                   | 1 -
 arch/arm/include/asm/esr.h                      | 1 +
 arch/arm/lib/asm-offsets.c                      | 1 -
 arch/arm/lib/bdinfo.c                           | 3 ++-
 arch/arm/lib/bootm-fdt.c                        | 1 -
 arch/arm/lib/bootm.c                            | 1 -
 arch/arm/lib/cache-cp15.c                       | 2 +-
 arch/arm/lib/cache-pl310.c                      | 1 -
 arch/arm/lib/cache.c                            | 2 +-
 arch/arm/lib/cmd_boot.c                         | 1 -
 arch/arm/lib/eabi_compat.c                      | 4 +++-
 arch/arm/lib/gic-v3-its.c                       | 1 -
 arch/arm/lib/image.c                            | 1 -
 arch/arm/lib/interrupts.c                       | 1 -
 arch/arm/lib/interrupts_64.c                    | 1 -
 arch/arm/lib/interrupts_m.c                     | 3 ++-
 arch/arm/lib/psci-dt.c                          | 1 -
 arch/arm/lib/reset.c                            | 1 -
 arch/arm/lib/save_prev_bl_data.c                | 1 -
 arch/arm/lib/spl.c                              | 1 -
 arch/arm/lib/stack.c                            | 1 -
 arch/arm/lib/zimage.c                           | 1 -
 58 files changed, 14 insertions(+), 57 deletions(-)
arch/arm/cpu/arm11/cpu.c +0 -1
index 1e16b89d0066..01d2e1a125d6 100644
@@ -14,7 +14,6 @@
  * CPU specific code
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
arch/arm/cpu/arm720t/interrupts.c +1 -1
index f0fc58deadba..e3d0216158fe 100644
@@ -9,7 +9,7 @@
  * Alex Zuepke <[email protected]>
  */
 
-#include <common.h>
+#include <linux/types.h>
 
 #if defined(CONFIG_ARCH_TEGRA)
 static ulong timestamp;
arch/arm/cpu/arm920t/cpu.c +0 -1
index 305713e78615..61e182305738 100644
@@ -12,7 +12,6 @@
  * CPU specific code
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
arch/arm/cpu/arm920t/start.S +0 -1
index cba4a1f0358f..e792e8e795ef 100644
@@ -8,7 +8,6 @@
  */
 
 #include <asm-offsets.h>
-#include <common.h>
 #include <config.h>
 
 /*
arch/arm/cpu/arm926ejs/cache.c +0 -1
index 95963d2665f4..5b87a3af91b2 100644
@@ -6,7 +6,6 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
-#include <common.h>
 
 #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 void invalidate_dcache_all(void)
arch/arm/cpu/arm926ejs/cpu.c +0 -1
index 2ce413a7f866..07ab04b7b08a 100644
@@ -12,7 +12,6 @@
  * CPU specific code
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
arch/arm/cpu/arm926ejs/start.S +0 -1
index c882bd39eab0..5d6c9f0861e1 100644
@@ -16,7 +16,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <common.h>
 #include <linux/linkage.h>
 
 /*
arch/arm/cpu/arm946es/cpu.c +0 -1
index 334bb5427432..efd232d34237 100644
@@ -12,7 +12,6 @@
  * CPU specific code
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
arch/arm/cpu/armv7/arch_timer.c +1 -1
index 17bd53dae847..f25a8674dea4 100644
@@ -4,7 +4,7 @@
  *     Texas Instruments Incorporated, <www.ti.com>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv7/cache_v7.c +0 -1
index 19ff4323528b..d11420d2fdd0 100644
@@ -7,7 +7,6 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
-#include <common.h>
 #include <asm/armv7.h>
 #include <asm/utils.h>
 
arch/arm/cpu/armv7/cp15.c +0 -1
index 0ac4e7ba8c80..b2c52db68dc9 100644
@@ -7,7 +7,6 @@
  * CP15 specific code
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/system.h>
 #include <asm/cache.h>
arch/arm/cpu/armv7/cpu.c +0 -1
index 6259ffa51086..aa981faef001 100644
@@ -14,7 +14,6 @@
  * CPU specific code
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
arch/arm/cpu/armv7/exception_level.c +0 -1
index f6d25bb682c7..7baade61b073 100644
@@ -8,7 +8,6 @@
  * secure mode before booting an operating system.
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <cpu_func.h>
 #include <log.h>
arch/arm/cpu/armv7/iproc-common/armpll.c +0 -1
index 8c3a323f0654..b345671b0a64 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/iproc-common/armpll.h>
 #include <asm/iproc-common/sysmap.h>
arch/arm/cpu/armv7/iproc-common/hwinit-common.c +0 -1
index 896d2f956942..eca7e8b512b4 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 
arch/arm/cpu/armv7/iproc-common/timer.c +0 -1
index a4255a44c001..b60d90f7e6a3 100644
@@ -3,7 +3,6 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
-#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <time.h>
arch/arm/cpu/armv7/mpu_v7r.c +0 -1
index 1d31c63e5fde..2d83e4c721d2 100644
@@ -6,7 +6,6 @@
  *	Lokesh Vutla <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <asm/armv7.h>
arch/arm/cpu/armv7/s5p4418/cpu.c +0 -1
index 8febfe527669..27ffb450378f 100644
@@ -4,7 +4,6 @@
  * Hyunseok, Jung <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/system.h>
 #include <asm/cache.h>
arch/arm/cpu/armv7/syslib.c +0 -1
index 7e29636972d9..f0eda1ca98d0 100644
@@ -7,7 +7,6 @@
  * Syed Mohammed Khasim <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 
 /************************************************************
arch/arm/cpu/armv7/vf610/generic.c +0 -1
index c23ddc12b456..e61ad7b96e90 100644
@@ -3,7 +3,6 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <command.h>
 #include <cpu_func.h>
arch/arm/cpu/armv7/vf610/timer.c +0 -1
index a9c1a8fcebc1..7bae0b5574af 100644
@@ -3,7 +3,6 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv7/virt-dt.c +0 -1
index c0422485ba4e..5dc7ed5e2707 100644
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <common.h>
 #include <errno.h>
 #include <log.h>
 #include <stdio_dev.h>
arch/arm/cpu/armv7/virt-v7.c +0 -1
index 5ffeca13d913..811499367d40 100644
@@ -8,7 +8,6 @@
  * needed to enable ARMv7 virtualization for current hypervisors
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/armv7.h>
 #include <asm/cache.h>
arch/arm/cpu/armv7m/cache.c +0 -1
index d1aecf6a85cf..b6d08b7aad73 100644
@@ -4,7 +4,6 @@
  * Author(s): Vikas Manocha, <[email protected]> for STMicroelectronics.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <log.h>
arch/arm/cpu/armv7m/cpu.c +0 -1
index 65427b5312be..b4440d3f3f84 100644
@@ -7,7 +7,6 @@
  * Kamil Lulko, <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/io.h>
arch/arm/cpu/armv7m/systick-timer.c +1 -1
index c30af4ff7a28..d8fa4f0c707a 100644
@@ -21,7 +21,7 @@
  * using CFG_SYS_HZ_CLOCK.
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>
arch/arm/cpu/armv8/cache_v8.c +0 -1
index 57d06f0575dc..d4c64f2d60d9 100644
@@ -7,7 +7,6 @@
  * Alexander Graf <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <log.h>
arch/arm/cpu/armv8/cpu-dt.c +0 -1
index 9bfe3815e51a..97667e607a83 100644
@@ -3,7 +3,6 @@
  * Copyright 2016 NXP Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/cache.h>
 #include <asm/psci.h>
 #include <asm/system.h>
arch/arm/cpu/armv8/cpu.c +0 -1
index 3c7f36ad8d89..d568efa427ab 100644
@@ -10,7 +10,6 @@
  * Gary Jennejohn, DENX Software Engineering, <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
arch/arm/cpu/armv8/exception_level.c +0 -1
index b11936548fb3..85c78f55789d 100644
@@ -8,7 +8,6 @@
  * level before booting an operating system.
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <cpu_func.h>
 #include <log.h>
arch/arm/cpu/armv8/generic_timer.c +0 -1
index 8f83372cbca4..e4aa5a474553 100644
@@ -4,7 +4,6 @@
  * David Feng <[email protected]>
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <time.h>
arch/arm/cpu/armv8/hisilicon/pinmux.c +0 -1
index e14057c0a47c..d7a5a7926102 100644
@@ -4,7 +4,6 @@
  * Peter Griffin <[email protected]>
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/gpio.h>
arch/arm/cpu/armv8/sec_firmware.c +1 -1
index c0e8726346f5..44372cbe4a1c 100644
@@ -3,7 +3,7 @@
  * Copyright 2016 NXP Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <fdt_support.h>
arch/arm/cpu/armv8/sha1_ce_glue.c +0 -1
index 780b119a90bf..c88b4dc66e1f 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2022 Linaro Ltd <[email protected]>
  */
 
-#include <common.h>
 #include <u-boot/sha1.h>
 
 extern void sha1_armv8_ce_process(uint32_t state[5], uint8_t const *src,
arch/arm/cpu/armv8/sha256_ce_glue.c +0 -1
index 67dd796c122d..d5d2b4f4ac7e 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2022 Linaro Ltd <[email protected]>
  */
 
-#include <common.h>
 #include <u-boot/sha256.h>
 
 extern void sha256_armv8_ce_process(uint32_t state[8], uint8_t const *src,
arch/arm/cpu/armv8/spin_table.c +0 -1
index 42a0962fdcda..485294b88d0a 100644
@@ -4,7 +4,6 @@
  *   Author: Masahiro Yamada <[email protected]>
  */
 
-#include <common.h>
 #include <linux/libfdt.h>
 #include <asm/spin_table.h>
 
arch/arm/cpu/armv8/spl_data.c +0 -1
index 8f1231c86ebb..259b49ff3640 100644
@@ -3,7 +3,6 @@
  * Copyright 2020 NXP
  */
 
-#include <common.h>
 #include <spl.h>
 
 char __data_save_start[0] __section(".__data_save_start");
arch/arm/include/asm/esr.h +1 -0
index f19e4e726a19..99488730998e 100644
@@ -7,6 +7,7 @@
 #ifndef __ASM_ESR_H
 #define __ASM_ESR_H
 
+#include <stdbool.h>
 #include <asm/memory.h>
 #include <linux/const.h>
 
arch/arm/lib/asm-offsets.c +0 -1
index 181a8ac4c27f..9afd83759996 100644
@@ -16,7 +16,6 @@
  *   Abdellatif El Khlifi <[email protected]>
  */
 
-#include <common.h>
 #include <linux/kbuild.h>
 #include <linux/arm-smccc.h>
 
arch/arm/lib/bdinfo.c +2 -1
index b88b01eefdcd..40255ace4051 100644
@@ -6,9 +6,10 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/mach-types.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/arm/lib/bootm-fdt.c +0 -1
index 29020bd1c6bc..2671f9a0ebf5 100644
@@ -14,7 +14,6 @@
  * Copyright (C) 2001  Erik Mouw ([email protected])
  */
 
-#include <common.h>
 #include <fdt_support.h>
 #ifdef CONFIG_ARMV7_NONSEC
 #include <asm/armv7.h>
arch/arm/lib/bootm.c +0 -1
index f30a483ed8b4..192c120a7d2e 100644
@@ -11,7 +11,6 @@
  * Copyright (C) 2001  Erik Mouw ([email protected])
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
 #include <command.h>
arch/arm/lib/cache-cp15.c +1 -1
index 0893915b3004..0b2a0c351547 100644
@@ -4,10 +4,10 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/system.h>
 #include <asm/cache.h>
 #include <linux/compiler.h>
arch/arm/lib/cache-pl310.c +0 -1
index d05314ee57fc..0afd3880447f 100644
@@ -9,7 +9,6 @@
 #include <asm/armv7.h>
 #include <asm/pl310.h>
 #include <config.h>
-#include <common.h>
 
 struct pl310_regs *const pl310 = (struct pl310_regs *)CFG_SYS_PL310_BASE;
 
arch/arm/lib/cache.c +1 -1
index 7a1601586711..b2ae74a59f10 100644
@@ -6,7 +6,7 @@
 
 /* for now: just dummy functions to satisfy the linker */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
arch/arm/lib/cmd_boot.c +0 -1
index c905ecc4bd94..5df5bc305a2f 100644
@@ -17,7 +17,6 @@
  * Copyright 2015 Konsulko Group, Matt Porter <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 
 /*
arch/arm/lib/eabi_compat.c +3 -1
index f7029918d4fb..0a96ba1355f8 100644
@@ -5,7 +5,9 @@
  * (C) Copyright 2009 Wolfgang Denk <[email protected]>
  */
 
-#include <common.h>
+#include <stdio.h>
+#include <linux/stddef.h>
+#include <linux/string.h>
 
 int raise (int signum)
 {
arch/arm/lib/gic-v3-its.c +0 -1
index f4bbd21da915..2cc0a32f9d47 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright 2019 Broadcom.
  */
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/gic.h>
arch/arm/lib/image.c +0 -1
index e394c1ad9093..1f672eee2c86 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <image.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
arch/arm/lib/interrupts.c +0 -1
index 9961472f69f7..333a5026a469 100644
@@ -18,7 +18,6 @@
  * Philippe Robin, ARM Ltd. <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <irq_func.h>
arch/arm/lib/interrupts_64.c +0 -1
index 125dc0bb390b..b3024ba514ec 100644
@@ -4,7 +4,6 @@
  * David Feng <[email protected]>
  */
 
-#include <common.h>
 #include <asm/esr.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
arch/arm/lib/interrupts_m.c +2 -1
index 277854aa878c..b977961bde8a 100644
@@ -4,9 +4,10 @@
  * Kamil Lulko, <[email protected]>
  */
 
-#include <common.h>
+#include <stdio.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <vsprintf.h>
 
 /*
  * Upon exception entry ARMv7-M processors automatically save stack
arch/arm/lib/psci-dt.c +0 -1
index 903b3357048a..be800a3bc9eb 100644
@@ -3,7 +3,6 @@
  * Copyright 2016 NXP Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/cache.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
arch/arm/lib/reset.c +0 -1
index 3e051e36f12d..c9796a4435c6 100644
@@ -20,7 +20,6 @@
  * (C) Copyright 2004 Texas Insturments
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
arch/arm/lib/save_prev_bl_data.c +0 -1
index b286bac9bf00..4357acaef6c4 100644
@@ -10,7 +10,6 @@
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <fdt.h>
-#include <common.h>
 #include <linux/errno.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>
arch/arm/lib/spl.c +0 -1
index b13897495dae..c43a63f1819e 100644
@@ -7,7 +7,6 @@
  * Tom Rini <[email protected]>
  */
 
-#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>
arch/arm/lib/stack.c +0 -1
index 656084c7e519..ea1b937add76 100644
@@ -10,7 +10,6 @@
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Marius Groeger <[email protected]>
  */
-#include <common.h>
 #include <init.h>
 #include <lmb.h>
 #include <asm/global_data.h>
arch/arm/lib/zimage.c +0 -1
index 45e9c4506a97..51287251b3f6 100644
@@ -6,7 +6,6 @@
  * bootz code:
  * Copyright (C) 2012 Marek Vasut <[email protected]>
  */
-#include <common.h>
 #include <image.h>
 
 #define	LINUX_ARM_ZIMAGE_MAGIC	0x016f2818
Signature · 1 line
2.34.1
author
#40 lore raw
In reply to Tom Rini
Quoted 3 lines · Tom Rini

This platform is no longer supported in tree, remove.

Applied to u-boot/next, thanks!

Signature · 1 line
Tom