mtd: Remove <common.h> and add needed includes

Remove <common.h> from this driver directory and when needed add missing include files directly. Reviewed-by: William Zhang <william.zhang@broadcom.com> Signed-off-by: Tom Rini <trini@konsulko.com>
2026-05-05 12:46:14 +02:00 · 2024-05-01 19:31:00 -06:00 · 2024-05-01 19:31:00 -06:00 · 6fa1cca73a
commit 6fa1cca73a
parent 7938ac657b
81 changed files with 25 additions and 81 deletions
--- a/drivers/mtd/altera_qspi.c
+++ b/drivers/mtd/altera_qspi.c
@ -3,7 +3,6 @@
 * Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
 */

-#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <errno.h>
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@ -16,7 +16,7 @@
 /* The DEBUG define must be before common to enable debugging */
 /* #define DEBUG	*/

-#include <common.h>
+#include <config.h>
 #include <console.h>
 #include <dm.h>
 #include <env.h>
@ -26,6 +26,7 @@
 #include <init.h>
 #include <irq_func.h>
 #include <log.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/io.h>
--- a/drivers/mtd/cfi_mtd.c
+++ b/drivers/mtd/cfi_mtd.c
@ -5,7 +5,6 @@
 * Written by: Piotr Ziecik <kosmo@semihalf.com>
 */

-#include <common.h>
 #include <dma.h>
 #include <flash.h>
 #include <malloc.h>
--- a/drivers/mtd/hbmc-am654.c
+++ b/drivers/mtd/hbmc-am654.c
@ -3,7 +3,6 @@
 // Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com/
 // Author: Vignesh Raghavendra <vigneshr@ti.com>

-#include <common.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <regmap.h>
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@ -11,7 +11,6 @@
 /* The DEBUG define must be before common to enable debugging */
 /*#define DEBUG*/

-#include <common.h>
 #include <flash.h>
 #include <log.h>
 #include <asm/processor.h>
--- a/drivers/mtd/mtd-uclass.c
+++ b/drivers/mtd/mtd-uclass.c
@ -5,7 +5,6 @@

 #define LOG_CATEGORY UCLASS_MTD

-#include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <errno.h>
--- a/drivers/mtd/mtd_uboot.c
+++ b/drivers/mtd/mtd_uboot.c
@ -3,7 +3,6 @@
 * (C) Copyright 2014
 * Heiko Schocher, DENX Software Engineering, hs@denx.de.
 */
-#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <malloc.h>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@ -19,7 +19,6 @@
 #include <linux/kmod.h>
 #endif

-#include <common.h>
 #include <malloc.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
--- a/drivers/mtd/nand/bbt.c
+++ b/drivers/mtd/nand/bbt.c
@ -9,7 +9,6 @@

 #define pr_fmt(fmt)	"nand-bbt: " fmt

-#include <common.h>
 #include <dm/devres.h>
 #include <linux/bitops.h>
 #include <linux/mtd/nand.h>
--- a/drivers/mtd/nand/core.c
+++ b/drivers/mtd/nand/core.c
@ -9,7 +9,6 @@

 #define pr_fmt(fmt)	"nand: " fmt

-#include <common.h>
 #include <watchdog.h>
 #ifndef __UBOOT__
 #include <linux/compat.h>
--- a/drivers/mtd/nand/raw/am335x_spl_bch.c
+++ b/drivers/mtd/nand/raw/am335x_spl_bch.c
@ -9,7 +9,7 @@
 * Stefan Roese, DENX Software Engineering, sr@denx.de.
 */

-#include <common.h>
+#include <config.h>
 #include <nand.h>
 #include <system-constants.h>
 #include <asm/io.h>
--- a/drivers/mtd/nand/raw/arasan_nfc.c
+++ b/drivers/mtd/nand/raw/arasan_nfc.c
@ -5,7 +5,6 @@
 * Copyright (C) 2014 - 2015 Xilinx, Inc.
 */

-#include <common.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <linux/delay.h>
--- a/drivers/mtd/nand/raw/atmel_nand.c
+++ b/drivers/mtd/nand/raw/atmel_nand.c
@ -10,7 +10,7 @@
 *     (C) Copyright 2012 ATMEL, Hong Xu
 */

-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <system-constants.h>
 #include <asm/gpio.h>
--- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+

-#include <common.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c
@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+

-#include <common.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c
@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+

-#include <common.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+

-#include <common.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6838_nand.c
@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+

-#include <common.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+

-#include <common.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@ -12,7 +12,6 @@
 * GNU General Public License for more details.
 */

-#include <common.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c
@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+

-#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <dm/devres.h>
--- a/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c
@ -4,7 +4,6 @@
 * Copyright (C) 2015 Broadcom Corporation
 */

-#include <common.h>
 #include <asm/io.h>
 #include <memalign.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/cortina_nand.c
+++ b/drivers/mtd/nand/raw/cortina_nand.c
@ -3,7 +3,6 @@
 * Copyright (c) 2020, Cortina Access Inc..
 */

-#include <common.h>
 #include <linux/delay.h>
 #include <linux/bitops.h>
 #include <linux/sizes.h>
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@ -28,7 +28,7 @@
 -
 */

-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
--- a/drivers/mtd/nand/raw/denali.c
+++ b/drivers/mtd/nand/raw/denali.c
@ -5,7 +5,6 @@
 * Copyright (C) 2009-2010, Intel Corporation and its suppliers.
 */

-#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/denali_spl.c
+++ b/drivers/mtd/nand/raw/denali_spl.c
@ -4,7 +4,7 @@
 * Copyright (C) 2014-2015  Masahiro Yamada <yamada.masahiro@socionext.com>
 */

-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@ -7,7 +7,7 @@
 *          Scott Wood <scottwood@freescale.com>
 */

-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/fsl_elbc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_spl.c
@ -9,7 +9,7 @@
 * Author: Scott Wood <scottwood@freescale.com>
 */

-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
--- a/drivers/mtd/nand/raw/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c
@ -6,7 +6,7 @@
 * Authors: Dipen Dudhat <Dipen.Dudhat@freescale.com>
 */

-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <malloc.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/fsl_ifc_spl.c
+++ b/drivers/mtd/nand/raw/fsl_ifc_spl.c
@ -6,7 +6,7 @@
 * Author: Dipen Dudhat <dipen.dudhat@freescale.com>
 */

-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <asm/io.h>
 #include <fsl_ifc.h>
--- a/drivers/mtd/nand/raw/kirkwood_nand.c
+++ b/drivers/mtd/nand/raw/kirkwood_nand.c
@ -5,7 +5,6 @@
 * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
 */

-#include <common.h>
 #include <linux/mtd/rawnand.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
--- a/drivers/mtd/nand/raw/kmeter1_nand.c
+++ b/drivers/mtd/nand/raw/kmeter1_nand.c
@ -4,7 +4,7 @@
 * Heiko Schocher, DENX Software Engineering, hs@denx.de
 */

-#include <common.h>
+#include <config.h>
 #include <nand.h>
 #include <asm/io.h>
 #include <linux/delay.h>
--- a/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_mlc.c
@ -19,7 +19,7 @@
 * should not rely on the ECC validity.
 */

-#include <common.h>
+#include <config.h>
 #include <nand.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@ -10,7 +10,7 @@
 * Author: Kevin Wells
 */

-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <nand.h>
 #include <linux/bug.h>
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@ -5,7 +5,7 @@
 * Copyright 2009 Ilya Yanok, <yanok@emcraft.com>
 */

-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <nand.h>
 #include <linux/delay.h>
--- a/drivers/mtd/nand/raw/mxc_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxc_nand_spl.c
@ -10,7 +10,7 @@
 * Stefan Roese, DENX Software Engineering, sr at denx.de.
 */

-#include <common.h>
+#include <config.h>
 #include <hang.h>
 #include <nand.h>
 #include <system-constants.h>
--- a/drivers/mtd/nand/raw/mxic_nand.c
+++ b/drivers/mtd/nand/raw/mxic_nand.c
@ -6,7 +6,6 @@
 *	Zhengxun Li <zhengxunli@mxic.com.tw>
 */

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <malloc.h>
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@ -13,7 +13,6 @@
 * Copyright 2017-2019 NXP
 */

-#include <common.h>
 #include <clk.h>
 #include <cpu_func.h>
 #include <dm.h>
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@ -4,7 +4,6 @@
 * Copyright 2019 NXP
 * Author: Tim Harvey <tharvey@gateworks.com>
 */
-#include <common.h>
 #include <log.h>
 #include <nand.h>
 #include <malloc.h>
--- a/drivers/mtd/nand/raw/nand.c
+++ b/drivers/mtd/nand/raw/nand.c
@ -5,7 +5,7 @@
 * Ladislav Michl <michl@2n.cz>
 */

-#include <common.h>
+#include <config.h>
 #include <nand.h>
 #include <errno.h>
 #include <linux/mtd/concat.h>
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@ -28,7 +28,6 @@
 */

 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <watchdog.h>
--- a/drivers/mtd/nand/raw/nand_bbt.c
+++ b/drivers/mtd/nand/raw/nand_bbt.c
@ -57,7 +57,6 @@
 *
 */

-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <dm/devres.h>
--- a/drivers/mtd/nand/raw/nand_bch.c
+++ b/drivers/mtd/nand/raw/nand_bch.c
@ -7,7 +7,6 @@
 *
 */

-#include <common.h>
 #include <log.h>
 #include <dm/devres.h>
 #include <linux/printk.h>
--- a/drivers/mtd/nand/raw/nand_ecc.c
+++ b/drivers/mtd/nand/raw/nand_ecc.c
@ -22,7 +22,6 @@
 * this file might be covered by the GNU General Public License.
 */

-#include <common.h>

 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
--- a/drivers/mtd/nand/raw/nand_ids.c
+++ b/drivers/mtd/nand/raw/nand_ids.c
@ -6,7 +6,6 @@
 * published by the Free Software Foundation.
 *
 */
-#include <common.h>
 #include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>

--- a/drivers/mtd/nand/raw/nand_spl_load.c
+++ b/drivers/mtd/nand/raw/nand_spl_load.c
@ -4,7 +4,7 @@
 * Heiko Schocher, DENX Software Engineering, hs@denx.de.
 */

-#include <common.h>
+#include <config.h>
 #include <nand.h>

 /*
--- a/drivers/mtd/nand/raw/nand_spl_simple.c
+++ b/drivers/mtd/nand/raw/nand_spl_simple.c
@ -4,7 +4,7 @@
 * Stefan Roese, DENX Software Engineering, sr@denx.de.
 */

-#include <common.h>
+#include <config.h>
 #include <nand.h>
 #include <system-constants.h>
 #include <asm/io.h>
--- a/drivers/mtd/nand/raw/nand_timings.c
+++ b/drivers/mtd/nand/raw/nand_timings.c
@ -8,7 +8,6 @@
 * published by the Free Software Foundation.
 *
 */
-#include <common.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/mtd/rawnand.h>
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@ -18,7 +18,6 @@
 * Copyright 2010 Freescale Semiconductor
 */

-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <watchdog.h>
--- a/drivers/mtd/nand/raw/omap_elm.c
+++ b/drivers/mtd/nand/raw/omap_elm.c
@ -12,7 +12,6 @@
 *    sets in uboot
 */

-#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/hardware.h>
--- a/drivers/mtd/nand/raw/omap_gpmc.c
+++ b/drivers/mtd/nand/raw/omap_gpmc.c
@ -4,7 +4,7 @@
 * Rohit Choraria <rohitkc@ti.com>
 */

-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <system-constants.h>
 #include <asm/io.h>
--- a/drivers/mtd/nand/raw/pxa3xx_nand.c
+++ b/drivers/mtd/nand/raw/pxa3xx_nand.c
@ -6,7 +6,6 @@
 * Copyright © 2006 Marvell International Ltd.
 */

-#include <common.h>
 #include <malloc.h>
 #include <fdtdec.h>
 #include <nand.h>
--- a/drivers/mtd/nand/raw/rockchip_nfc.c
+++ b/drivers/mtd/nand/raw/rockchip_nfc.c
@ -5,7 +5,6 @@
 * Author: Yifeng Zhao <yifeng.zhao@rock-chips.com>
 */

-#include <common.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@ -6,7 +6,6 @@

 #define LOG_CATEGORY UCLASS_MTD

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@ -25,7 +25,6 @@
 */

 #include <clk.h>
-#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <memalign.h>
--- a/drivers/mtd/nand/raw/sunxi_nand_spl.c
+++ b/drivers/mtd/nand/raw/sunxi_nand_spl.c
@ -6,7 +6,6 @@

 #include <asm/arch/clock.h>
 #include <asm/io.h>
-#include <common.h>
 #include <config.h>
 #include <nand.h>
 #include <linux/bitops.h>
--- a/drivers/mtd/nand/raw/tegra_nand.c
+++ b/drivers/mtd/nand/raw/tegra_nand.c
@ -6,7 +6,6 @@
 * (C) Copyright 2006 DENX Software Engineering
 */

-#include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
--- a/drivers/mtd/nand/raw/vf610_nfc.c
+++ b/drivers/mtd/nand/raw/vf610_nfc.c
@ -21,7 +21,7 @@
 * - HW ECC: Only 24 and 32-bit error correction implemented.
 */

-#include <common.h>
+#include <config.h>
 #include <malloc.h>
 #include <dm/device_compat.h>
 #include <linux/printk.h>
--- a/drivers/mtd/nand/raw/zynq_nand.c
+++ b/drivers/mtd/nand/raw/zynq_nand.c
@ -6,7 +6,6 @@
 * This driver is based on plat_nand.c and mxc_nand.c drivers
 */

-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/io.h>
--- a/drivers/mtd/nand/spi/core.c
+++ b/drivers/mtd/nand/spi/core.c
@ -21,7 +21,6 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi-mem.h>
 #else
-#include <common.h>
 #include <errno.h>
 #include <watchdog.h>
 #include <spi.h>
--- a/drivers/mtd/nvmxip/nvmxip-uclass.c
+++ b/drivers/mtd/nvmxip/nvmxip-uclass.c
@ -6,7 +6,6 @@
 *   Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #if CONFIG_IS_ENABLED(SANDBOX64)
--- a/drivers/mtd/nvmxip/nvmxip.c
+++ b/drivers/mtd/nvmxip/nvmxip.c
@ -6,7 +6,6 @@
 *   Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <mapmem.h>
--- a/drivers/mtd/nvmxip/nvmxip_qspi.c
+++ b/drivers/mtd/nvmxip/nvmxip_qspi.c
@ -6,7 +6,6 @@
 *   Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
 */

-#include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <linux/errno.h>
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@ -19,7 +19,6 @@
 * published by the Free Software Foundation.
 */

-#include <common.h>
 #include <log.h>
 #include <watchdog.h>
 #include <dm/devres.h>
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@ -14,7 +14,6 @@
 * published by the Free Software Foundation.
 */

-#include <common.h>
 #include <log.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
--- a/drivers/mtd/onenand/onenand_spl.c
+++ b/drivers/mtd/onenand/onenand_spl.c
@ -7,9 +7,10 @@
 *	Kyungmin Park <kyungmin.park@samsung.com>
 */

-#include <common.h>
+#include <config.h>
 #include <asm/io.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <linux/mtd/onenand_regs.h>
 #include <onenand_uboot.h>

--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@ -13,7 +13,7 @@
 * OneNAND initialization at U-Boot
 */

-#include <common.h>
+#include <config.h>
 #include <display_options.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@ -9,7 +9,6 @@
 *	Emulate the pseudo BufferRAM
 */

-#include <common.h>
 #include <malloc.h>
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@ -7,7 +7,6 @@
 * Copyright (C) 2017 Marek Vasut <marek.vasut@gmail.com>
 */

-#include <common.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <clk.h>
--- a/drivers/mtd/spi/fsl_espi_spl.c
+++ b/drivers/mtd/spi/fsl_espi_spl.c
@ -3,7 +3,7 @@
 * Copyright 2013 Freescale Semiconductor, Inc.
 */

-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <spi_flash.h>
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@ -10,7 +10,6 @@

 #define LOG_CATEGORY UCLASS_SPI_FLASH

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
--- a/drivers/mtd/spi/sf-uclass.c
+++ b/drivers/mtd/spi/sf-uclass.c
@ -5,7 +5,6 @@

 #define LOG_CATEGORY UCLASS_SPI_FLASH

-#include <common.h>
 #include <bootdev.h>
 #include <dm.h>
 #include <log.h>
--- a/drivers/mtd/spi/sf_bootdev.c
+++ b/drivers/mtd/spi/sf_bootdev.c
@ -5,7 +5,6 @@
 * Copyright 2022 Google LLC
 */

-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
--- a/drivers/mtd/spi/sf_dataflash.c
+++ b/drivers/mtd/spi/sf_dataflash.c
@ -6,7 +6,6 @@
 * Haikun Wang (haikun.wang@freescale.com)
 */

-#include <common.h>
 #include <display_options.h>
 #include <dm.h>
 #include <errno.h>
--- a/drivers/mtd/spi/sf_mtd.c
+++ b/drivers/mtd/spi/sf_mtd.c
@ -3,7 +3,6 @@
 * Copyright (C) 2012-2014 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
 */

-#include <common.h>
 #include <malloc.h>
 #include <linux/errno.h>
 #include <linux/mtd/mtd.h>
--- a/drivers/mtd/spi/sf_probe.c
+++ b/drivers/mtd/spi/sf_probe.c
@ -7,7 +7,6 @@
 * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc.
 */

-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <linux/mtd/spi-nor.h>
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@ -9,7 +9,6 @@
 * Synced from Linux v4.19
 */

-#include <common.h>
 #include <display_options.h>
 #include <log.h>
 #include <watchdog.h>
--- a/drivers/mtd/spi/spi-nor-ids.c
+++ b/drivers/mtd/spi/spi-nor-ids.c
@ -6,7 +6,6 @@
 * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/
 */

-#include <common.h>
 #include <spi.h>
 #include <spi_flash.h>

--- a/drivers/mtd/spi/spi-nor-tiny.c
+++ b/drivers/mtd/spi/spi-nor-tiny.c
@ -9,7 +9,6 @@
 * Synced from Linux v4.19
 */

-#include <common.h>
 #include <log.h>
 #include <dm/device_compat.h>
 #include <linux/err.h>
--- a/drivers/mtd/stm32_flash.c
+++ b/drivers/mtd/stm32_flash.c
@ -4,7 +4,7 @@
 * Kamil Lulko, <kamil.lulko@gmail.com>
 */

-#include <common.h>
+#include <config.h>
 #include <flash.h>
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
--- a/drivers/mtd/ubispl/ubispl.c
+++ b/drivers/mtd/ubispl/ubispl.c
@ -7,7 +7,6 @@
 * Copyright (c) International Business Machines Corp., 2006
 */

-#include <common.h>
 #include <errno.h>
 #include <linux/bug.h>
 #include <u-boot/crc.h>