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

Remove <common.h> from this driver directory and when needed add missing include files directly. Reviewed-by: Heiko Schocher <hs@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com>
2025-04-15 17:34:43 +00:00 · 2024-05-01 19:30:52 -06:00 · 2024-05-01 19:30:52 -06:00 · 3ebb4546eb
commit 3ebb4546eb
parent 356675ffd9
49 changed files with 12 additions and 49 deletions
--- a/drivers/i2c/acpi_i2c.c
+++ b/drivers/i2c/acpi_i2c.c
@ -3,7 +3,6 @@
 * Copyright 2019 Google LLC
 */

-#include <common.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
--- a/drivers/i2c/ast2600_i2c.c
+++ b/drivers/i2c/ast2600_i2c.c
@ -2,7 +2,6 @@
 /*
 * Copyright ASPEED Technology Inc.
 */
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
--- a/drivers/i2c/ast_i2c.c
+++ b/drivers/i2c/ast_i2c.c
@ -5,7 +5,6 @@
 * Copyright 2017 Google, Inc.
 */

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
--- a/drivers/i2c/at91_i2c.c
+++ b/drivers/i2c/at91_i2c.c
@ -8,7 +8,6 @@
 #include <malloc.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
--- a/drivers/i2c/cros_ec_ldo.c
+++ b/drivers/i2c/cros_ec_ldo.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <cros_ec.h>
 #include <errno.h>
--- a/drivers/i2c/cros_ec_tunnel.c
+++ b/drivers/i2c/cros_ec_tunnel.c
@ -4,7 +4,6 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <cros_ec.h>
 #include <errno.h>
--- a/drivers/i2c/davinci_i2c.c
+++ b/drivers/i2c/davinci_i2c.c
@ -11,7 +11,7 @@
 * Please see doc/driver-model/i2c-howto.rst for instructions.
 */

-#include <common.h>
+#include <config.h>
 #include <i2c.h>
 #include <dm.h>
 #include <log.h>
--- a/drivers/i2c/designware_i2c.c
+++ b/drivers/i2c/designware_i2c.c
@ -4,7 +4,6 @@
 * Vipin Kumar, STMicroelectronics, vipin.kumar@st.com.
 */

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <i2c.h>
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@ -5,7 +5,6 @@
 * Copyright 2019 Google Inc
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
--- a/drivers/i2c/exynos_hs_i2c.c
+++ b/drivers/i2c/exynos_hs_i2c.c
@ -6,7 +6,6 @@
 * David Mueller, ELSOFT AG, d.mueller@elsoft.ch
 */

-#include <common.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@ -6,7 +6,7 @@
 * Changes for multibus/multiadapter I2C support.
 */

-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <i2c.h>		/* Functional interface */
 #include <log.h>
--- a/drivers/i2c/i2c-cdns.c
+++ b/drivers/i2c/i2c-cdns.c
@ -7,7 +7,6 @@
 * with added driver-model support and code cleanup.
 */

-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <linux/bitops.h>
--- a/drivers/i2c/i2c-cortina.c
+++ b/drivers/i2c/i2c-cortina.c
@ -4,12 +4,12 @@
 * Arthur Li, Cortina Access, arthur.li@cortina-access.com.
 */

-#include <common.h>
 #include <i2c.h>
 #include <log.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <time.h>
 #include "i2c-cortina.h"

 static void set_speed(struct i2c_regs *regs, int i2c_spd)
--- a/drivers/i2c/i2c-emul-uclass.c
+++ b/drivers/i2c/i2c-emul-uclass.c
@ -5,7 +5,6 @@

 #define LOG_CATEGORY UCLASS_I2C_EMUL

-#include <common.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
--- a/drivers/i2c/i2c-gpio.c
+++ b/drivers/i2c/i2c-gpio.c
@ -5,7 +5,6 @@
 * This file is based on: drivers/i2c/soft-i2c.c,
 * with added driver-model support and code cleanup.
 */
-#include <common.h>
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
--- a/drivers/i2c/i2c-microchip.c
+++ b/drivers/i2c/i2c-microchip.c
@ -6,7 +6,6 @@
 * Padmarao Begari <padmarao.begari@microchip.com>
 * Conor Dooley <conor.dooley@microchip.com>
 */
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <i2c.h>
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@ -5,7 +5,6 @@

 #define LOG_CATEGORY UCLASS_I2C

-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
--- a/drivers/i2c/i2c-versatile.c
+++ b/drivers/i2c/i2c-versatile.c
@ -5,7 +5,6 @@
 *
 */

-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@ -7,7 +7,7 @@
 *
 * Multibus/multiadapter I2C core functions (wrappers)
 */
-#include <common.h>
+#include <config.h>
 #include <i2c.h>
 #include <linker_lists.h>
 #include <asm/global_data.h>
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@ -4,7 +4,6 @@
 * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
 */

-#include <common.h>
 #include <i2c.h>
 #include <dm.h>
 #include <regmap.h>
--- a/drivers/i2c/imx_lpi2c.c
+++ b/drivers/i2c/imx_lpi2c.c
@ -3,7 +3,6 @@
 * Copyright 2016 Freescale Semiconductors, Inc.
 */

-#include <common.h>
 #include <errno.h>
 #include <log.h>
 #include <asm/io.h>
--- a/drivers/i2c/intel_i2c.c
+++ b/drivers/i2c/intel_i2c.c
@ -7,11 +7,11 @@
 * Copyright (C) 2016 Stefan Roese <sr@denx.de>
 */

-#include <common.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
 #include <pci.h>
+#include <time.h>
 #include <asm/io.h>

 /* PCI Configuration Space (D31:F3): SMBus */
--- a/drivers/i2c/iproc_i2c.c
+++ b/drivers/i2c/iproc_i2c.c
@ -6,7 +6,6 @@

 #include <asm/global_data.h>
 #include <asm/io.h>
-#include <common.h>
 #include <config.h>
 #include <dm.h>
 #include <linux/printk.h>
--- a/drivers/i2c/lpc32xx_i2c.c
+++ b/drivers/i2c/lpc32xx_i2c.c
@ -6,7 +6,7 @@
 * Written-by: Albert ARIBAUD - 3ADEV <albert.aribaud@3adev.fr>
 */

-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <asm/io.h>
 #include <i2c.h>
--- a/drivers/i2c/meson_i2c.c
+++ b/drivers/i2c/meson_i2c.c
@ -2,7 +2,6 @@
 /*
 * (C) Copyright 2017 - Beniamino Galvani <b.galvani@gmail.com>
 */
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <clk.h>
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@ -4,12 +4,12 @@
 * Written by Simon Glass <sjg@chromium.org>
 */

-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
 #include <log.h>
 #include <malloc.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <linux/delay.h>
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@ -10,7 +10,6 @@
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm-generic/gpio.h>
-#include <common.h>
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <dm/devres.h>
--- a/drivers/i2c/muxes/i2c-mux-uclass.c
+++ b/drivers/i2c/muxes/i2c-mux-uclass.c
@ -6,7 +6,6 @@

 #define LOG_CATEGORY UCLASS_I2C_MUX

-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@ -5,7 +5,6 @@
 * Written by Michal Simek
 */

-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
--- a/drivers/i2c/mv_i2c.c
+++ b/drivers/i2c/mv_i2c.c
@ -16,7 +16,6 @@
 * Murray.Jensen@cmst.csiro.au, 27-Jan-01.
 */

-#include <common.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@ -7,7 +7,7 @@
 * Copyright (c) 2010 Albert Aribaud.
 */

-#include <common.h>
+#include <config.h>
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@ -14,7 +14,7 @@
 *
 */

-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
--- a/drivers/i2c/nx_i2c.c
+++ b/drivers/i2c/nx_i2c.c
@ -1,8 +1,8 @@
-#include <common.h>
 #include <errno.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
+#include <time.h>
 #include <asm/arch/nexell.h>
 #include <asm/arch/reset.h>
 #include <asm/arch/clk.h>
--- a/drivers/i2c/ocores_i2c.c
+++ b/drivers/i2c/ocores_i2c.c
@ -12,7 +12,6 @@
 * Andreas Larsson <andreas@gaisler.com>
 */

-#include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <clk.h>
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@ -38,7 +38,6 @@
 *
 */

-#include <common.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
--- a/drivers/i2c/qup_i2c.c
+++ b/drivers/i2c/qup_i2c.c
@ -9,7 +9,6 @@

 #include <init.h>
 #include <env.h>
-#include <common.h>
 #include <log.h>
 #include <dm/device_compat.h>
 #include <linux/delay.h>
--- a/drivers/i2c/rcar_i2c.c
+++ b/drivers/i2c/rcar_i2c.c
@ -11,7 +11,6 @@
 *   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
 */

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <i2c.h>
--- a/drivers/i2c/rcar_iic.c
+++ b/drivers/i2c/rcar_iic.c
@ -9,7 +9,6 @@
 * Copyright (C) 2011, 2013 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
 */

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <i2c.h>
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@ -6,7 +6,6 @@
 * Peter, Software Engineering, <superpeter.cai@gmail.com>.
 */

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <errno.h>
--- a/drivers/i2c/s3c24x0_i2c.c
+++ b/drivers/i2c/s3c24x0_i2c.c
@ -4,10 +4,10 @@
 * David Mueller, ELSOFT AG, d.mueller@elsoft.ch
 */

-#include <common.h>
 #include <errno.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <time.h>
 #if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_ARCH_EXYNOS5)
 #include <log.h>
 #include <asm/arch/clk.h>
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@ -5,7 +5,6 @@
 * Copyright (c) 2014 Google, Inc
 */

-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
--- a/drivers/i2c/sh_i2c.c
+++ b/drivers/i2c/sh_i2c.c
@ -7,7 +7,6 @@
 * Please see doc/driver-model/i2c-howto.rst for instructions.
 */

-#include <common.h>
 #include <i2c.h>
 #include <log.h>
 #include <asm/global_data.h>
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@ -15,7 +15,7 @@
 * Please see doc/driver-model/i2c-howto.rst for instructions.
 */

-#include <common.h>
+#include <config.h>
 #if defined(CONFIG_AT91FAMILY)
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
--- a/drivers/i2c/stm32f7_i2c.c
+++ b/drivers/i2c/stm32f7_i2c.c
@ -5,7 +5,6 @@

 #define LOG_CATEGORY UCLASS_I2C

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <i2c.h>
--- a/drivers/i2c/sun6i_p2wi.c
+++ b/drivers/i2c/sun6i_p2wi.c
@ -15,7 +15,6 @@

 #include <axp_pmic.h>
 #include <clk.h>
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
--- a/drivers/i2c/sun8i_rsb.c
+++ b/drivers/i2c/sun8i_rsb.c
@ -10,7 +10,6 @@

 #include <axp_pmic.h>
 #include <clk.h>
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@ -3,7 +3,6 @@
 * Copyright (c) 2016, NVIDIA CORPORATION.
 */

-#include <common.h>
 #include <dm.h>
 #include <i2c.h>
 #include <log.h>
--- a/drivers/i2c/tegra_i2c.c
+++ b/drivers/i2c/tegra_i2c.c
@ -5,7 +5,6 @@
 *  NVIDIA Corporation <www.nvidia.com>
 */

-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <i2c.h>
--- a/drivers/i2c/xilinx_xiic.c
+++ b/drivers/i2c/xilinx_xiic.c
@ -9,7 +9,6 @@
 * Copyright (c) 2009-2010 Intel Corporation
 */

-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <i2c.h>