arm: tegra: Remove <common.h> and add needed includes

Remove <common.h> from all mach-tegra and include/asm/arch-tegra files and when needed add missing include files directly. Signed-off-by: Tom Rini <trini@konsulko.com>
2025-08-18 13:16:59 +02:00 · 2024-04-30 07:35:31 -06:00 · 2024-04-30 07:35:31 -06:00 · d6bf10009b
commit d6bf10009b
parent 97d4896b53
43 changed files with 16 additions and 41 deletions
--- a/arch/arm/include/asm/arch-tegra/ap.h
+++ b/arch/arm/include/asm/arch-tegra/ap.h
@ -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)
--- a/arch/arm/include/asm/arch-tegra/cboot.h
+++ b/arch/arm/include/asm/arch-tegra/cboot.h
@ -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
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@ -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>
--- a/arch/arm/mach-tegra/arm64-mmu.c
+++ b/arch/arm/mach-tegra/arm64-mmu.c
@ -7,7 +7,6 @@
 * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
 */

-#include <common.h>
 #include <asm/system.h>
 #include <asm/armv8/mmu.h>

--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@ -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>
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@ -4,7 +4,7 @@
 *  NVIDIA Corporation <www.nvidia.com>
 */

-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <env.h>
 #include <errno.h>
--- a/arch/arm/mach-tegra/cache.c
+++ b/arch/arm/mach-tegra/cache.c
@ -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)
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@ -3,7 +3,6 @@
 * Copyright (c) 2016-2018, NVIDIA CORPORATION.
 */

-#include <common.h>
 #include <env.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@ -5,7 +5,6 @@

 /* Tegra SoC common clock control functions */

-#include <common.h>
 #include <div64.h>
 #include <dm.h>
 #include <errno.h>
--- a/arch/arm/mach-tegra/cmd_enterrcm.c
+++ b/arch/arm/mach-tegra/cmd_enterrcm.c
@ -24,7 +24,6 @@
 * (C) Copyright 2004 Texas Insturments
 */

-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>
--- a/arch/arm/mach-tegra/cpu.c
+++ b/arch/arm/mach-tegra/cpu.c
@ -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>
--- a/arch/arm/mach-tegra/crypto.c
+++ b/arch/arm/mach-tegra/crypto.c
@ -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>
--- a/arch/arm/mach-tegra/dt-setup.c
+++ b/arch/arm/mach-tegra/dt-setup.c
@ -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>
--- a/arch/arm/mach-tegra/emc.c
+++ b/arch/arm/mach-tegra/emc.c
@ -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>
--- a/arch/arm/mach-tegra/fuse.c
+++ b/arch/arm/mach-tegra/fuse.c
@ -7,7 +7,6 @@
 *  Svyatoslav Ryhel <clamor95@gmail.com>
 */

-#include <common.h>
 #include <linux/delay.h>
 #include <asm/io.h>

--- a/arch/arm/mach-tegra/gpu.c
+++ b/arch/arm/mach-tegra/gpu.c
@ -5,7 +5,6 @@

 /* Tegra vpr routines */

-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
--- a/arch/arm/mach-tegra/ivc.c
+++ b/arch/arm/mach-tegra/ivc.c
@ -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
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@ -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>
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@ -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>
--- a/arch/arm/mach-tegra/spl.c
+++ b/arch/arm/mach-tegra/spl.c
@ -5,7 +5,6 @@
 *
 * Allen Martin <amartin@nvidia.com>
 */
-#include <common.h>
 #include <debug_uart.h>
 #include <log.h>
 #include <spl.h>
--- a/arch/arm/mach-tegra/sys_info.c
+++ b/arch/arm/mach-tegra/sys_info.c
@ -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)
--- a/arch/arm/mach-tegra/tegra114/clock.c
+++ b/arch/arm/mach-tegra/tegra114/clock.c
@ -6,7 +6,6 @@

 /* Tegra114 Clock control functions */

-#include <common.h>
 #include <init.h>
 #include <log.h>
 #include <asm/io.h>
--- a/arch/arm/mach-tegra/tegra114/cpu.c
+++ b/arch/arm/mach-tegra/tegra114/cpu.c
@ -4,7 +4,6 @@
 * NVIDIA Corporation <www.nvidia.com>
 */

-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@ -6,7 +6,7 @@

 /* Tegra124 Clock control functions */

-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <log.h>
 #include <asm/io.h>
--- a/arch/arm/mach-tegra/tegra124/cpu.c
+++ b/arch/arm/mach-tegra/tegra124/cpu.c
@ -4,7 +4,6 @@
 * NVIDIA Corporation <www.nvidia.com>
 */

-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/arch/ahb.h>
--- a/arch/arm/mach-tegra/tegra124/pmc.c
+++ b/arch/arm/mach-tegra/tegra124/pmc.c
@ -3,7 +3,6 @@
 * Copyright (C) 2017 Google, Inc
 */

-#include <common.h>
 #include <dm.h>
 #include <syscon.h>

--- a/arch/arm/mach-tegra/tegra124/psci.c
+++ b/arch/arm/mach-tegra/tegra124/psci.c
@ -4,7 +4,6 @@
 * Author: Jan Kiszka <jan.kiszka@siemens.com>
 */

-#include <common.h>
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/arch/flow.h>
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@ -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>
--- a/arch/arm/mach-tegra/tegra20/bct.c
+++ b/arch/arm/mach-tegra/tegra20/bct.c
@ -4,7 +4,6 @@
 * Copyright (c) 2022, Svyatoslav Ryhel <clamor95@gmail.com>
 */

-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <asm/arch-tegra/crypto.h>
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@ -7,7 +7,6 @@

 /* Tegra20 Clock control functions */

-#include <common.h>
 #include <errno.h>
 #include <init.h>
 #include <log.h>
--- a/arch/arm/mach-tegra/tegra20/cpu.c
+++ b/arch/arm/mach-tegra/tegra20/cpu.c
@ -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>
--- a/arch/arm/mach-tegra/tegra20/display.c
+++ b/arch/arm/mach-tegra/tegra20/display.c
@ -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>
--- a/arch/arm/mach-tegra/tegra20/emc.c
+++ b/arch/arm/mach-tegra/tegra20/emc.c
@ -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>
--- a/arch/arm/mach-tegra/tegra20/pmu.c
+++ b/arch/arm/mach-tegra/tegra20/pmu.c
@ -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>
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@ -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>
--- a/arch/arm/mach-tegra/tegra20/warmboot_avp.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
@ -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>
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@ -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>
--- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c
@ -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>
--- a/arch/arm/mach-tegra/tegra30/bct.c
+++ b/arch/arm/mach-tegra/tegra30/bct.c
@ -4,9 +4,9 @@
 * Copyright (c) 2022, Svyatoslav Ryhel <clamor95@gmail.com>
 */

-#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"
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@ -6,7 +6,6 @@

 /* Tegra30 Clock control functions */

-#include <common.h>
 #include <errno.h>
 #include <init.h>
 #include <log.h>
--- a/arch/arm/mach-tegra/tegra30/cpu.c
+++ b/arch/arm/mach-tegra/tegra30/cpu.c
@ -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>
--- a/arch/arm/mach-tegra/xusb-padctl-common.c
+++ b/arch/arm/mach-tegra/xusb-padctl-common.c
@ -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>
--- a/arch/arm/mach-tegra/xusb-padctl-dummy.c
+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c
@ -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)