[PATCH 68/81] sysreset: Remove <common.h> and add needed includes

Kever Yang kever.yang at rock-chips.com
Fri May 10 02:44:37 CEST 2024


On 2024/5/2 09:31, Tom Rini wrote:
> Remove <common.h> from this driver directory and when needed
> add missing include files directly.
>
> Signed-off-by: Tom Rini <trini at konsulko.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> Cc: Tom Rini <trini at konsulko.com>
> Cc: Michal Simek <michal.simek at amd.com>
> Cc: Mario Six <mario.six at gdsys.cc>
> Cc: Weijie Gao <weijie.gao at mediatek.com>
> Cc: GSS_MTK_Uboot_upstream <GSS_MTK_Uboot_upstream at mediatek.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Philipp Tomsich <philipp.tomsich at vrull.eu>
> Cc: Kever Yang <kever.yang at rock-chips.com>
> Cc: Rick Chen <rick at andestech.com>
> Cc: Leo <ycliang at andestech.com>
> Cc: Marek Vasut <marex at denx.de>
> Cc: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com>
> Cc: Tien Fong Chee <tien.fong.chee at intel.com>
> Cc: Patrice Chotard <patrice.chotard at foss.st.com>
> Cc: Max Filippov <jcmvbkbc at gmail.com>
> Cc: Paul Barker <paul.barker.ct at bp.renesas.com>
> Cc: Bin Meng <bmeng.cn at gmail.com>
> ---
>   drivers/sysreset/poweroff_gpio.c          | 1 -
>   drivers/sysreset/sysreset-ti-sci.c        | 1 -
>   drivers/sysreset/sysreset-uclass.c        | 1 -
>   drivers/sysreset/sysreset_ast.c           | 1 -
>   drivers/sysreset/sysreset_at91.c          | 1 -
>   drivers/sysreset/sysreset_gpio.c          | 1 -
>   drivers/sysreset/sysreset_microblaze.c    | 1 -
>   drivers/sysreset/sysreset_mpc83xx.c       | 1 -
>   drivers/sysreset/sysreset_octeon.c        | 1 -
>   drivers/sysreset/sysreset_psci.c          | 1 -
>   drivers/sysreset/sysreset_resetctl.c      | 1 -
>   drivers/sysreset/sysreset_rockchip.c      | 1 -
>   drivers/sysreset/sysreset_sandbox.c       | 1 -
>   drivers/sysreset/sysreset_sbi.c           | 1 -
>   drivers/sysreset/sysreset_socfpga.c       | 1 -
>   drivers/sysreset/sysreset_socfpga_soc64.c | 1 -
>   drivers/sysreset/sysreset_sti.c           | 1 -
>   drivers/sysreset/sysreset_syscon.c        | 1 -
>   drivers/sysreset/sysreset_watchdog.c      | 1 -
>   drivers/sysreset/sysreset_x86.c           | 1 -
>   drivers/sysreset/sysreset_xtfpga.c        | 2 +-
>   21 files changed, 1 insertion(+), 21 deletions(-)
>
> diff --git a/drivers/sysreset/poweroff_gpio.c b/drivers/sysreset/poweroff_gpio.c
> index ad04e4b1a85e..d9220024f470 100644
> --- a/drivers/sysreset/poweroff_gpio.c
> +++ b/drivers/sysreset/poweroff_gpio.c
> @@ -11,7 +11,6 @@
>    * Copyright (C) 2012 Jamie Lentin
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <log.h>
> diff --git a/drivers/sysreset/sysreset-ti-sci.c b/drivers/sysreset/sysreset-ti-sci.c
> index 0de132633a8d..451fc5de7357 100644
> --- a/drivers/sysreset/sysreset-ti-sci.c
> +++ b/drivers/sysreset/sysreset-ti-sci.c
> @@ -6,7 +6,6 @@
>    *	Andreas Dannenberg <dannenberg at ti.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <log.h>
> diff --git a/drivers/sysreset/sysreset-uclass.c b/drivers/sysreset/sysreset-uclass.c
> index 6151b5fe03e4..0abb4042e0f2 100644
> --- a/drivers/sysreset/sysreset-uclass.c
> +++ b/drivers/sysreset/sysreset-uclass.c
> @@ -6,7 +6,6 @@
>   
>   #define LOG_CATEGORY UCLASS_SYSRESET
>   
> -#include <common.h>
>   #include <command.h>
>   #include <cpu_func.h>
>   #include <dm.h>
> diff --git a/drivers/sysreset/sysreset_ast.c b/drivers/sysreset/sysreset_ast.c
> index 92fad96871bd..ef09440bbeff 100644
> --- a/drivers/sysreset/sysreset_ast.c
> +++ b/drivers/sysreset/sysreset_ast.c
> @@ -3,7 +3,6 @@
>    * (C) Copyright 2016 Google, Inc
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <log.h>
> diff --git a/drivers/sysreset/sysreset_at91.c b/drivers/sysreset/sysreset_at91.c
> index fc85f31ebf01..457042c7aae9 100644
> --- a/drivers/sysreset/sysreset_at91.c
> +++ b/drivers/sysreset/sysreset_at91.c
> @@ -7,7 +7,6 @@
>   #include <asm/io.h>
>   #include <asm/arch/at91_rstc.h>
>   #include <clk.h>
> -#include <common.h>
>   #include <cpu_func.h>
>   #include <dm.h>
>   #include <dm/device_compat.h>
> diff --git a/drivers/sysreset/sysreset_gpio.c b/drivers/sysreset/sysreset_gpio.c
> index de42b5935424..47018844a51a 100644
> --- a/drivers/sysreset/sysreset_gpio.c
> +++ b/drivers/sysreset/sysreset_gpio.c
> @@ -3,7 +3,6 @@
>    * Copyright (C) 2018 Xilinx, Inc. - Michal Simek
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <log.h>
> diff --git a/drivers/sysreset/sysreset_microblaze.c b/drivers/sysreset/sysreset_microblaze.c
> index 83a7f77ac41f..b81d82f046bd 100644
> --- a/drivers/sysreset/sysreset_microblaze.c
> +++ b/drivers/sysreset/sysreset_microblaze.c
> @@ -3,7 +3,6 @@
>    * Copyright (C) 2018 Xilinx, Inc. - Michal Simek
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <sysreset.h>
> diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
> index ca48328f7b58..dca49299f777 100644
> --- a/drivers/sysreset/sysreset_mpc83xx.c
> +++ b/drivers/sysreset/sysreset_mpc83xx.c
> @@ -4,7 +4,6 @@
>    * Mario Six, Guntermann & Drunck GmbH, mario.six at gdsys.cc
>    */
>   
> -#include <common.h>
>   #include <command.h>
>   #include <dm.h>
>   #include <log.h>
> diff --git a/drivers/sysreset/sysreset_octeon.c b/drivers/sysreset/sysreset_octeon.c
> index ebdea6ab66ed..c16223720e5a 100644
> --- a/drivers/sysreset/sysreset_octeon.c
> +++ b/drivers/sysreset/sysreset_octeon.c
> @@ -3,7 +3,6 @@
>    * Copyright (C) 2020 Stefan Roese <sr at denx.de>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <sysreset.h>
> diff --git a/drivers/sysreset/sysreset_psci.c b/drivers/sysreset/sysreset_psci.c
> index aa09d0b88271..89b4f2dcaec4 100644
> --- a/drivers/sysreset/sysreset_psci.c
> +++ b/drivers/sysreset/sysreset_psci.c
> @@ -3,7 +3,6 @@
>    * Copyright (C) 2017 Masahiro Yamada <yamada.masahiro at socionext.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <sysreset.h>
>   #include <linux/errno.h>
> diff --git a/drivers/sysreset/sysreset_resetctl.c b/drivers/sysreset/sysreset_resetctl.c
> index 25bd5c9a7ff2..fbe3999b9605 100644
> --- a/drivers/sysreset/sysreset_resetctl.c
> +++ b/drivers/sysreset/sysreset_resetctl.c
> @@ -5,7 +5,6 @@
>    * Author:  Weijie Gao <weijie.gao at mediatek.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <sysreset.h>
> diff --git a/drivers/sysreset/sysreset_rockchip.c b/drivers/sysreset/sysreset_rockchip.c
> index f353f9b4c79d..00308f9a33b7 100644
> --- a/drivers/sysreset/sysreset_rockchip.c
> +++ b/drivers/sysreset/sysreset_rockchip.c
> @@ -3,7 +3,6 @@
>    * (C) Copyright 2017 Rockchip Electronics Co., Ltd
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <sysreset.h>
> diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
> index c12eda81d03e..93179f90bbb8 100644
> --- a/drivers/sysreset/sysreset_sandbox.c
> +++ b/drivers/sysreset/sysreset_sandbox.c
> @@ -4,7 +4,6 @@
>    * Written by Simon Glass <sjg at chromium.org>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <sysreset.h>
> diff --git a/drivers/sysreset/sysreset_sbi.c b/drivers/sysreset/sysreset_sbi.c
> index 5e8090d62bfc..458191206b2c 100644
> --- a/drivers/sysreset/sysreset_sbi.c
> +++ b/drivers/sysreset/sysreset_sbi.c
> @@ -3,7 +3,6 @@
>    * Copyright 2021, Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <log.h>
> diff --git a/drivers/sysreset/sysreset_socfpga.c b/drivers/sysreset/sysreset_socfpga.c
> index 9b62dd5eab09..a07b0f4fd553 100644
> --- a/drivers/sysreset/sysreset_socfpga.c
> +++ b/drivers/sysreset/sysreset_socfpga.c
> @@ -4,7 +4,6 @@
>    * Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <sysreset.h>
> diff --git a/drivers/sysreset/sysreset_socfpga_soc64.c b/drivers/sysreset/sysreset_socfpga_soc64.c
> index 9837aadf64b6..6f44792abb00 100644
> --- a/drivers/sysreset/sysreset_socfpga_soc64.c
> +++ b/drivers/sysreset/sysreset_socfpga_soc64.c
> @@ -4,7 +4,6 @@
>    * Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <sysreset.h>
> diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c
> index edd90aab061d..110b7e23afa1 100644
> --- a/drivers/sysreset/sysreset_sti.c
> +++ b/drivers/sysreset/sysreset_sti.c
> @@ -4,7 +4,6 @@
>    * Author(s): Patrice Chotard, <patrice.chotard at foss.st.com> for STMicroelectronics.
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <regmap.h>
>   #include <syscon.h>
> diff --git a/drivers/sysreset/sysreset_syscon.c b/drivers/sysreset/sysreset_syscon.c
> index e468dac0e902..57144fa1e3bb 100644
> --- a/drivers/sysreset/sysreset_syscon.c
> +++ b/drivers/sysreset/sysreset_syscon.c
> @@ -7,7 +7,6 @@
>    *	Author: Feng Kan <fkan at apm.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <regmap.h>
> diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c
> index 6db5aa75b541..49c061e08803 100644
> --- a/drivers/sysreset/sysreset_watchdog.c
> +++ b/drivers/sysreset/sysreset_watchdog.c
> @@ -3,7 +3,6 @@
>    * Copyright (C) 2017 Álvaro Fernández Rojas <noltari at gmail.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <dm/device-internal.h>
>   #include <errno.h>
> diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c
> index dc772b5ff9e3..c2f28c65280f 100644
> --- a/drivers/sysreset/sysreset_x86.c
> +++ b/drivers/sysreset/sysreset_x86.c
> @@ -5,7 +5,6 @@
>    * Generic reset driver for x86 processor
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <efi_loader.h>
>   #include <pch.h>
> diff --git a/drivers/sysreset/sysreset_xtfpga.c b/drivers/sysreset/sysreset_xtfpga.c
> index 84fbc79016a0..ab71ea11a0b2 100644
> --- a/drivers/sysreset/sysreset_xtfpga.c
> +++ b/drivers/sysreset/sysreset_xtfpga.c
> @@ -5,7 +5,7 @@
>    * (C) Copyright 2016 Cadence Design Systems Inc.
>    */
>   
> -#include <common.h>
> +#include <config.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <sysreset.h>


More information about the U-Boot mailing list