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

Remove <common.h> from all mach-rockchip and include/asm/arch-rockchip files and when needed add missing include files directly. Signed-off-by: Tom Rini <trini@konsulko.com>
2025-08-19 05:31:31 +02:00 · 2024-04-30 07:35:36 -06:00 · 2024-04-30 07:35:36 -06:00 · c501db7566
commit c501db7566
parent 4b2c15ab57
54 changed files with 7 additions and 52 deletions
--- a/arch/arm/include/asm/arch-rockchip/bootrom.h
+++ b/arch/arm/include/asm/arch-rockchip/bootrom.h
@ -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.
--- a/arch/arm/include/asm/arch-rockchip/clock.h
+++ b/arch/arm/include/asm/arch-rockchip/clock.h
@ -6,6 +6,8 @@
 #ifndef _ASM_ARCH_CLOCK_H
 #define _ASM_ARCH_CLOCK_H

+#include <linux/types.h>
+
 struct udevice;

 /* define pll mode */
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@ -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>
--- a/arch/arm/mach-rockchip/boot_mode.c
+++ b/arch/arm/mach-rockchip/boot_mode.c
@ -3,7 +3,6 @@
 * (C) Copyright 2016 Rockchip Electronics Co., Ltd
 */

-#include <common.h>
 #include <adc.h>
 #include <command.h>
 #include <env.h>
--- a/arch/arm/mach-rockchip/bootrom.c
+++ b/arch/arm/mach-rockchip/bootrom.c
@ -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>
--- a/arch/arm/mach-rockchip/cpu-info.c
+++ b/arch/arm/mach-rockchip/cpu-info.c
@ -4,7 +4,6 @@
 * Author: Jagan Teki <jagan@amarulasolutions.com>
 */

-#include <common.h>
 #include <env.h>
 #include <init.h>
 #include <asm/arch-rockchip/clock.h>
--- a/arch/arm/mach-rockchip/px30-board-tpl.c
+++ b/arch/arm/mach-rockchip/px30-board-tpl.c
@ -3,7 +3,6 @@
 * (C) Copyright 2019 Rockchip Electronics Co., Ltd
 */

-#include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <init.h>
--- a/arch/arm/mach-rockchip/px30/clk_px30.c
+++ b/arch/arm/mach-rockchip/px30/clk_px30.c
@ -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>
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@ -2,7 +2,6 @@
 /*
 * Copyright (c) 2017 Rockchip Electronics Co., Ltd
 */
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <fdt_support.h>
--- a/arch/arm/mach-rockchip/px30/syscon_px30.c
+++ b/arch/arm/mach-rockchip/px30/syscon_px30.c
@ -3,7 +3,6 @@
 * (C) Copyright 2017 Rockchip Electronics Co., Ltd
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3036/clk_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/clk_rk3036.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
--- a/arch/arm/mach-rockchip/rk3036/rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/rk3036.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/syscon_rk3036.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3066/clk_rk3066.c
+++ b/arch/arm/mach-rockchip/rk3066/clk_rk3066.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
--- a/arch/arm/mach-rockchip/rk3066/rk3066.c
+++ b/arch/arm/mach-rockchip/rk3066/rk3066.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
+++ b/arch/arm/mach-rockchip/rk3066/syscon_rk3066.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
--- a/arch/arm/mach-rockchip/rk3128/clk_rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/clk_rk3128.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/syscon_rk3128.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3188/clk_rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/clk_rk3188.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@ -2,7 +2,6 @@
 /*
 * (C) Copyright 2019 Rockchip Electronics Co., Ltd
 */
-#include <common.h>
 #include <dm.h>
 #include <hang.h>
 #include <init.h>
--- a/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/syscon_rk3188.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
--- a/arch/arm/mach-rockchip/rk322x/clk_rk322x.c
+++ b/arch/arm/mach-rockchip/rk322x/clk_rk322x.c
@ -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>
--- a/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c
+++ b/arch/arm/mach-rockchip/rk322x/syscon_rk322x.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@ -2,7 +2,6 @@
 /*
 * Copyright (c) 2016 Rockchip Electronics Co., Ltd
 */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>
--- a/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/syscon_rk3288.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <log.h>
--- a/arch/arm/mach-rockchip/rk3308/clk_rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/clk_rk3308.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3308/rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c
+++ b/arch/arm/mach-rockchip/rk3308/syscon_rk3308.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3328/clk_rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/clk_rk3328.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/syscon_rk3328.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3368/clk_rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/clk_rk3368.c
@ -4,7 +4,6 @@
 * Author: Andy Yan <andy.yan@rock-chips.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@ -4,7 +4,6 @@
 * Copyright (c) 2016 Andreas Färber
 */

-#include <common.h>
 #include <init.h>
 #include <syscon.h>
 #include <asm/armv8/mmu.h>
--- a/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/syscon_rk3368.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@ -3,7 +3,6 @@
 * Copyright (c) 2016 Rockchip Electronics Co., Ltd
 */

-#include <common.h>
 #include <fdt_support.h>
 #include <init.h>
 #include <log.h>
--- a/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/syscon_rk3399.c
@ -3,7 +3,6 @@
 * (C) Copyright 2016 Rockchip Electronics Co., Ltd
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
--- a/arch/arm/mach-rockchip/rk3568/clk_rk3568.c
+++ b/arch/arm/mach-rockchip/rk3568/clk_rk3568.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3568/rk3568.c
+++ b/arch/arm/mach-rockchip/rk3568/rk3568.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c
+++ b/arch/arm/mach-rockchip/rk3568/syscon_rk3568.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3588/clk_rk3588.c
+++ b/arch/arm/mach-rockchip/rk3588/clk_rk3588.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3588/rk3588.c
+++ b/arch/arm/mach-rockchip/rk3588/rk3588.c
@ -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>
--- a/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
+++ b/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
@ -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>
--- a/arch/arm/mach-rockchip/rv1108/clk_rv1108.c
+++ b/arch/arm/mach-rockchip/rv1108/clk_rv1108.c
@ -4,7 +4,6 @@
 * Author: Andy Yan <andy.yan@rock-chips.com>
 */

-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/arch-rockchip/clock.h>
--- a/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c
+++ b/arch/arm/mach-rockchip/rv1108/syscon_rv1108.c
@ -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>
--- a/arch/arm/mach-rockchip/rv1126/clk_rv1126.c
+++ b/arch/arm/mach-rockchip/rv1126/clk_rv1126.c
@ -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>
--- a/arch/arm/mach-rockchip/rv1126/rv1126.c
+++ b/arch/arm/mach-rockchip/rv1126/rv1126.c
@ -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>
--- a/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c
+++ b/arch/arm/mach-rockchip/rv1126/syscon_rv1126.c
@ -4,7 +4,6 @@
 * Copyright (c) 2022 Edgeble AI Technologies Pvt. Ltd.
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
--- a/arch/arm/mach-rockchip/sdram.c
+++ b/arch/arm/mach-rockchip/sdram.c
@ -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>
--- a/arch/arm/mach-rockchip/spl-boot-order.c
+++ b/arch/arm/mach-rockchip/spl-boot-order.c
@ -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>
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@ -3,7 +3,6 @@
 * (C) Copyright 2019 Rockchip Electronics Co., Ltd
 */

-#include <common.h>
 #include <bootstage.h>
 #include <debug_uart.h>
 #include <dm.h>