Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/test/dm/acpi.c b/test/dm/acpi.c
index 4db2171..f14b396 100644
--- a/test/dm/acpi.c
+++ b/test/dm/acpi.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <console.h>
#include <dm.h>
#include <malloc.h>
diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index 87bd8ae..44bcabd 100644
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <dm.h>
#include <uuid.h>
#include <acpi/acpigen.h>
diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c
index 7113219..15b2b6f 100644
--- a/test/dm/acpigen.c
+++ b/test/dm/acpigen.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <dm.h>
#include <irq.h>
#include <malloc.h>
diff --git a/test/dm/adc.c b/test/dm/adc.c
index a26a677..740167e 100644
--- a/test/dm/adc.c
+++ b/test/dm/adc.c
@@ -6,6 +6,7 @@
* Przemyslaw Marczak <p.marczak@samsung.com>
*/
+#include <common.h>
#include <adc.h>
#include <dm.h>
#include <dm/root.h>
diff --git a/test/dm/audio.c b/test/dm/audio.c
index 3d1d821..add15ae 100644
--- a/test/dm/audio.c
+++ b/test/dm/audio.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <audio_codec.h>
#include <dm.h>
#include <dm/test.h>
diff --git a/test/dm/axi.c b/test/dm/axi.c
index 0900a9b..dc029df 100644
--- a/test/dm/axi.c
+++ b/test/dm/axi.c
@@ -4,6 +4,7 @@
* Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
*/
+#include <common.h>
#include <axi.h>
#include <dm.h>
#include <log.h>
diff --git a/test/dm/blk.c b/test/dm/blk.c
index d03aec3..799f1e4 100644
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <blk.h>
#include <dm.h>
#include <part.h>
diff --git a/test/dm/blkmap.c b/test/dm/blkmap.c
index 7581e62..7a163d6 100644
--- a/test/dm/blkmap.c
+++ b/test/dm/blkmap.c
@@ -4,6 +4,7 @@
* Author: Tobias Waldekranz <tobias@waldekranz.com>
*/
+#include <common.h>
#include <blk.h>
#include <blkmap.h>
#include <dm.h>
diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c
index 9cfc7d4..b77b472 100644
--- a/test/dm/bootcount.c
+++ b/test/dm/bootcount.c
@@ -3,6 +3,7 @@
* (C) 2018 Theobroma Systems Design und Consulting GmbH
*/
+#include <common.h>
#include <dm.h>
#include <bootcount.h>
#include <log.h>
diff --git a/test/dm/bus.c b/test/dm/bus.c
index a338c7f..89a6aa6 100644
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -3,6 +3,7 @@
* Copyright (c) 2014 Google, Inc
*/
+#include <common.h>
#ifdef CONFIG_SANDBOX
#include <log.h>
#include <os.h>
diff --git a/test/dm/button.c b/test/dm/button.c
index 9157ec9..830d96f 100644
--- a/test/dm/button.c
+++ b/test/dm/button.c
@@ -5,6 +5,7 @@
* Based on led.c
*/
+#include <common.h>
#include <dm.h>
#include <adc.h>
#include <button.h>
diff --git a/test/dm/cache.c b/test/dm/cache.c
index d2f3bfe..bbd8f98 100644
--- a/test/dm/cache.c
+++ b/test/dm/cache.c
@@ -3,6 +3,7 @@
* Copyright (C) 2019 Intel Corporation <www.intel.com>
*/
+#include <common.h>
#include <dm.h>
#include <dm/test.h>
diff --git a/test/dm/clk.c b/test/dm/clk.c
index a966471..57fabbd 100644
--- a/test/dm/clk.c
+++ b/test/dm/clk.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <clk.h>
#include <dm.h>
#include <log.h>
diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c
index 15fba31..61dad8d 100644
--- a/test/dm/clk_ccf.c
+++ b/test/dm/clk_ccf.c
@@ -4,6 +4,7 @@
* Lukasz Majewski, DENX Software Engineering, lukma@denx.de
*/
+#include <common.h>
#include <clk.h>
#include <dm.h>
#include <asm/clk.h>
diff --git a/test/dm/core.c b/test/dm/core.c
index 4741c81..7f3f8d1 100644
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -5,6 +5,7 @@
* Copyright (c) 2013 Google, Inc
*/
+#include <common.h>
#include <errno.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/test/dm/cpu.c b/test/dm/cpu.c
index acba810..5734cd0 100644
--- a/test/dm/cpu.c
+++ b/test/dm/cpu.c
@@ -4,6 +4,7 @@
* Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
*/
+#include <common.h>
#include <dm.h>
#include <log.h>
#include <dm/test.h>
diff --git a/test/dm/cros_ec.c b/test/dm/cros_ec.c
index ac0055f..30cb70e 100644
--- a/test/dm/cros_ec.c
+++ b/test/dm/cros_ec.c
@@ -3,6 +3,7 @@
* Copyright 2021 Google LLC
*/
+#include <common.h>
#include <cros_ec.h>
#include <dm.h>
#include <asm/test.h>
diff --git a/test/dm/cros_ec_pwm.c b/test/dm/cros_ec_pwm.c
index f68ee6f..f8d6e1e 100644
--- a/test/dm/cros_ec_pwm.c
+++ b/test/dm/cros_ec_pwm.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
#include <cros_ec.h>
#include <dm.h>
#include <pwm.h>
diff --git a/test/dm/devres.c b/test/dm/devres.c
index 95a470b..3df0f64 100644
--- a/test/dm/devres.c
+++ b/test/dm/devres.c
@@ -5,6 +5,7 @@
* Copyright 2019 Google LLC
*/
+#include <common.h>
#include <errno.h>
#include <dm.h>
#include <log.h>
diff --git a/test/dm/dma.c b/test/dm/dma.c
index 949710f..cce47cb 100644
--- a/test/dm/dma.c
+++ b/test/dm/dma.c
@@ -6,6 +6,7 @@
* Grygorii Strashko <grygorii.strashko@ti.com>
*/
+#include <common.h>
#include <dm.h>
#include <malloc.h>
#include <dm/test.h>
diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c
index 68686a4..6e0a5df 100644
--- a/test/dm/dsi_host.c
+++ b/test/dm/dsi_host.c
@@ -4,6 +4,7 @@
* Author(s): Yannick Fertre <yannick.fertre@st.com> for STMicroelectronics.
*/
+#include <common.h>
#include <dm.h>
#include <dsi_host.h>
#include <asm/state.h>
diff --git a/test/dm/efi_media.c b/test/dm/efi_media.c
index 9d0ed0f..e343a0e 100644
--- a/test/dm/efi_media.c
+++ b/test/dm/efi_media.c
@@ -5,6 +5,7 @@
* Copyright 2021 Google LLC
*/
+#include <common.h>
#include <dm.h>
#include <asm/test.h>
#include <dm/test.h>
diff --git a/test/dm/eth.c b/test/dm/eth.c
index 820b8cb..bb3dcc6 100644
--- a/test/dm/eth.c
+++ b/test/dm/eth.c
@@ -6,6 +6,7 @@
* Joe Hershberger <joe.hershberger@ni.com>
*/
+#include <common.h>
#include <dm.h>
#include <env.h>
#include <fdtdec.h>
diff --git a/test/dm/fastboot.c b/test/dm/fastboot.c
index 5d938eb..758538d 100644
--- a/test/dm/fastboot.c
+++ b/test/dm/fastboot.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <fastboot.h>
#include <fb_mmc.h>
diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index b484414..087d484 100644
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -3,6 +3,7 @@
* Copyright 2020 NXP
*/
+#include <common.h>
#include <dm.h>
#include <asm/global_data.h>
#include <dm/of_extra.h>
diff --git a/test/dm/ffa.c b/test/dm/ffa.c
index fa6d54d..6912666 100644
--- a/test/dm/ffa.c
+++ b/test/dm/ffa.c
@@ -8,6 +8,7 @@
* Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
*/
+#include <common.h>
#include <console.h>
#include <dm.h>
#include <asm/sandbox_arm_ffa.h>
diff --git a/test/dm/firmware.c b/test/dm/firmware.c
index ec68e81..f37bccf 100644
--- a/test/dm/firmware.c
+++ b/test/dm/firmware.c
@@ -3,6 +3,7 @@
* Copyright (C) 2018 Xilinx, Inc.
*/
+#include <common.h>
#include <dm.h>
#include <syscon.h>
#include <asm/test.h>
diff --git a/test/dm/fwu_mdata.c b/test/dm/fwu_mdata.c
index 43ce3d0..52018f6 100644
--- a/test/dm/fwu_mdata.c
+++ b/test/dm/fwu_mdata.c
@@ -5,6 +5,7 @@
*/
#include <blk.h>
+#include <common.h>
#include <dm.h>
#include <fwu.h>
#include <fwu_mdata.h>
diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index 957ab25..0d88ec2 100644
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -3,6 +3,7 @@
* Copyright (C) 2013 Google, Inc
*/
+#include <common.h>
#include <fdtdec.h>
#include <dm.h>
#include <log.h>
diff --git a/test/dm/host.c b/test/dm/host.c
index e514f84..ca05a36 100644
--- a/test/dm/host.c
+++ b/test/dm/host.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <blk.h>
#include <dm.h>
#include <fs.h>
diff --git a/test/dm/hwspinlock.c b/test/dm/hwspinlock.c
index a05b183..995759d 100644
--- a/test/dm/hwspinlock.c
+++ b/test/dm/hwspinlock.c
@@ -3,6 +3,7 @@
* Copyright (C) 2018, STMicroelectronics - All Rights Reserved
*/
+#include <common.h>
#include <dm.h>
#include <hwspinlock.h>
#include <asm/state.h>
diff --git a/test/dm/i2c.c b/test/dm/i2c.c
index e9cf9f7..b46a22e 100644
--- a/test/dm/i2c.c
+++ b/test/dm/i2c.c
@@ -5,6 +5,7 @@
* Note: Test coverage does not include 10-bit addressing
*/
+#include <common.h>
#include <dm.h>
#include <fdtdec.h>
#include <i2c.h>
diff --git a/test/dm/i2s.c b/test/dm/i2s.c
index a3d3a31..c2bf4d5 100644
--- a/test/dm/i2s.c
+++ b/test/dm/i2s.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <dm.h>
#include <i2s.h>
#include <asm/test.h>
diff --git a/test/dm/iommu.c b/test/dm/iommu.c
index acea5f2..62d38f1 100644
--- a/test/dm/iommu.c
+++ b/test/dm/iommu.c
@@ -3,6 +3,7 @@
* Copyright (C) 2021 Mark Kettenis <kettenis@openbsd.org>
*/
+#include <common.h>
#include <dm.h>
#include <dm/test.h>
#include <dm/uclass-internal.h>
diff --git a/test/dm/irq.c b/test/dm/irq.c
index d22772a..51dd5e4 100644
--- a/test/dm/irq.c
+++ b/test/dm/irq.c
@@ -5,6 +5,7 @@
* Copyright 2019 Google LLC
*/
+#include <common.h>
#include <dm.h>
#include <irq.h>
#include <acpi/acpi_device.h>
diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c
index 2a58149..354720f 100644
--- a/test/dm/k210_pll.c
+++ b/test/dm/k210_pll.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020 Sean Anderson <seanga2@gmail.com>
*/
+#include <common.h>
/* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
#include <div64.h>
#include <dm/test.h>
diff --git a/test/dm/led.c b/test/dm/led.c
index c28fa04..eed3f46 100644
--- a/test/dm/led.c
+++ b/test/dm/led.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <led.h>
#include <asm/gpio.h>
diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c
index 14f72d5..7ad8a1c 100644
--- a/test/dm/mailbox.c
+++ b/test/dm/mailbox.c
@@ -3,6 +3,7 @@
* Copyright (c) 2016, NVIDIA CORPORATION.
*/
+#include <common.h>
#include <dm.h>
#include <malloc.h>
#include <dm/test.h>
diff --git a/test/dm/mdio.c b/test/dm/mdio.c
index 7ececf3..f863c52 100644
--- a/test/dm/mdio.c
+++ b/test/dm/mdio.c
@@ -4,6 +4,7 @@
* Alex Marginean, NXP
*/
+#include <common.h>
#include <dm.h>
#include <log.h>
#include <miiphy.h>
diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c
index 33a7e97..bfe3518 100644
--- a/test/dm/mdio_mux.c
+++ b/test/dm/mdio_mux.c
@@ -4,6 +4,7 @@
* Alex Marginean, NXP
*/
+#include <common.h>
#include <dm.h>
#include <miiphy.h>
#include <misc.h>
diff --git a/test/dm/misc.c b/test/dm/misc.c
index ad856fd..8bdd8c6 100644
--- a/test/dm/misc.c
+++ b/test/dm/misc.c
@@ -4,6 +4,7 @@
* Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
*/
+#include <common.h>
#include <dm.h>
#include <dm/test.h>
#include <misc.h>
diff --git a/test/dm/mmc.c b/test/dm/mmc.c
index c0abea7..b1eb8be 100644
--- a/test/dm/mmc.c
+++ b/test/dm/mmc.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <mmc.h>
#include <part.h>
diff --git a/test/dm/mux-cmd.c b/test/dm/mux-cmd.c
index d4bb8be..11c237b 100644
--- a/test/dm/mux-cmd.c
+++ b/test/dm/mux-cmd.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020 Texas Instruments Inc.
* Pratyush Yadav <p.yadav@ti.com>
*/
+#include <common.h>
#include <dm.h>
#include <mux.h>
#include <mux-internal.h>
@@ -12,7 +13,6 @@
#include <test/ut.h>
#include <console.h>
#include <rand.h>
-#include <time.h>
#define BUF_SIZE 256
diff --git a/test/dm/mux-emul.c b/test/dm/mux-emul.c
index febd521..c6aeeb7 100644
--- a/test/dm/mux-emul.c
+++ b/test/dm/mux-emul.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/
* Pratyush Yadav <p.yadav@ti.com>
*/
+#include <common.h>
#include <dm.h>
#include <mux.h>
#include <mux-internal.h>
diff --git a/test/dm/mux-mmio.c b/test/dm/mux-mmio.c
index 3a871a1..27c881d 100644
--- a/test/dm/mux-mmio.c
+++ b/test/dm/mux-mmio.c
@@ -4,6 +4,7 @@
* Jean-Jacques Hiblot <jjhiblot@ti.com>
*/
+#include <common.h>
#include <dm.h>
#include <mux.h>
#include <regmap.h>
diff --git a/test/dm/nop.c b/test/dm/nop.c
index 0c79431..f7d9a0f 100644
--- a/test/dm/nop.c
+++ b/test/dm/nop.c
@@ -6,6 +6,7 @@
* Jean-Jacques Hiblot <jjhiblot@ti.com>
*/
+#include <common.h>
#include <dm.h>
#include <dm/ofnode.h>
#include <dm/lists.h>
diff --git a/test/dm/nvmxip.c b/test/dm/nvmxip.c
index 537959a..f0ad47d 100644
--- a/test/dm/nvmxip.c
+++ b/test/dm/nvmxip.c
@@ -8,6 +8,7 @@
* Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
*/
+#include <common.h>
#include <blk.h>
#include <console.h>
#include <dm.h>
diff --git a/test/dm/of_extra.c b/test/dm/of_extra.c
index 3c31bfc..ac2d886 100644
--- a/test/dm/of_extra.c
+++ b/test/dm/of_extra.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <dm.h>
#include <dm/of_extra.h>
#include <dm/test.h>
diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c
index d4939e8..a241c42 100644
--- a/test/dm/of_platdata.c
+++ b/test/dm/of_platdata.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
#include <clk.h>
#include <dm.h>
#include <dt-structs.h>
diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index 39191d7..a5bc43a 100644
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -16,6 +16,7 @@
* behaviour of each ofnode function, since that is done by the normal ones.
*/
+#include <common.h>
#include <abuf.h>
#include <dm.h>
#include <log.h>
diff --git a/test/dm/ofread.c b/test/dm/ofread.c
index 69d03c4..3523860 100644
--- a/test/dm/ofread.c
+++ b/test/dm/ofread.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
#include <dm.h>
#include <dm/test.h>
#include <test/ut.h>
diff --git a/test/dm/osd.c b/test/dm/osd.c
index cf4a3a5..6279b39 100644
--- a/test/dm/osd.c
+++ b/test/dm/osd.c
@@ -4,6 +4,7 @@
* Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
*/
+#include <common.h>
#include <display_options.h>
#include <dm.h>
#include <video_osd.h>
diff --git a/test/dm/p2sb.c b/test/dm/p2sb.c
index 3ada1fc..df24709 100644
--- a/test/dm/p2sb.c
+++ b/test/dm/p2sb.c
@@ -5,6 +5,7 @@
* Copyright 2019 Google LLC
*/
+#include <common.h>
#include <dm.h>
#include <p2sb.h>
#include <asm/test.h>
diff --git a/test/dm/panel.c b/test/dm/panel.c
index 8be7c39..4d435a0 100644
--- a/test/dm/panel.c
+++ b/test/dm/panel.c
@@ -6,6 +6,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <backlight.h>
#include <dm.h>
#include <panel.h>
diff --git a/test/dm/part.c b/test/dm/part.c
index cabb31d..d6e4345 100644
--- a/test/dm/part.c
+++ b/test/dm/part.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020 Sean Anderson <sean.anderson@seco.com>
*/
+#include <common.h>
#include <dm.h>
#include <mmc.h>
#include <part.h>
diff --git a/test/dm/pch.c b/test/dm/pch.c
index b37b856..53f7bbf 100644
--- a/test/dm/pch.c
+++ b/test/dm/pch.c
@@ -3,6 +3,7 @@
* Copyright 2018 Google LLC
*/
+#include <common.h>
#include <dm.h>
#include <pch.h>
#include <asm/test.h>
diff --git a/test/dm/pci.c b/test/dm/pci.c
index 9b97f2e..8c5e7da 100644
--- a/test/dm/pci.c
+++ b/test/dm/pci.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <asm/io.h>
#include <asm/test.h>
diff --git a/test/dm/pci_ep.c b/test/dm/pci_ep.c
index e82fc53..9941abd 100644
--- a/test/dm/pci_ep.c
+++ b/test/dm/pci_ep.c
@@ -3,6 +3,7 @@
* Copyright (C) 2019 Ramon Fried
*/
+#include <common.h>
#include <dm.h>
#include <hexdump.h>
#include <pci_ep.h>
diff --git a/test/dm/phy.c b/test/dm/phy.c
index d14117f..0cf3689 100644
--- a/test/dm/phy.c
+++ b/test/dm/phy.c
@@ -4,6 +4,7 @@
* Written by Jean-Jacques Hiblot <jjhiblot@ti.com>
*/
+#include <common.h>
#include <dm.h>
#include <generic-phy.h>
#include <log.h>
diff --git a/test/dm/phys2bus.c b/test/dm/phys2bus.c
index 1ee2150..342f2fa 100644
--- a/test/dm/phys2bus.c
+++ b/test/dm/phys2bus.c
@@ -3,6 +3,7 @@
* Copyright (c) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
*/
+#include <common.h>
#include <dm.h>
#include <mapmem.h>
#include <phys2bus.h>
diff --git a/test/dm/pinmux.c b/test/dm/pinmux.c
index cfbe3ef..6880b2d 100644
--- a/test/dm/pinmux.c
+++ b/test/dm/pinmux.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020 Sean Anderson <seanga2@gmail.com>
*/
+#include <common.h>
#include <dm.h>
#include <dm/pinctrl.h>
#include <dm/test.h>
diff --git a/test/dm/pmc.c b/test/dm/pmc.c
index bbad1ee..e70227e 100644
--- a/test/dm/pmc.c
+++ b/test/dm/pmc.c
@@ -5,6 +5,7 @@
* Copyright 2019 Google LLC
*/
+#include <common.h>
#include <dm.h>
#include <power/acpi_pmc.h>
#include <dm/test.h>
diff --git a/test/dm/pmic.c b/test/dm/pmic.c
index 53a6f03..ce67120 100644
--- a/test/dm/pmic.c
+++ b/test/dm/pmic.c
@@ -6,6 +6,7 @@
* Przemyslaw Marczak <p.marczak@samsung.com>
*/
+#include <common.h>
#include <errno.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c
index 120a905..8604b5d 100644
--- a/test/dm/power-domain.c
+++ b/test/dm/power-domain.c
@@ -3,6 +3,7 @@
* Copyright (c) 2016, NVIDIA CORPORATION.
*/
+#include <common.h>
#include <dm.h>
#include <malloc.h>
#include <dm/test.h>
diff --git a/test/dm/pwm.c b/test/dm/pwm.c
index 8013334..dff626c 100644
--- a/test/dm/pwm.c
+++ b/test/dm/pwm.c
@@ -3,6 +3,7 @@
* Copyright (C) 2017 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <pwm.h>
#include <asm/test.h>
diff --git a/test/dm/qfw.c b/test/dm/qfw.c
index 3c35416..f3f3568 100644
--- a/test/dm/qfw.c
+++ b/test/dm/qfw.c
@@ -3,6 +3,7 @@
* Copyright 2021 Asherah Connor <ashe@kivikakk.ee>
*/
+#include <common.h>
#include <qfw.h>
#include <dm.h>
#include <asm/test.h>
diff --git a/test/dm/ram.c b/test/dm/ram.c
index 188c7c3..f624343 100644
--- a/test/dm/ram.c
+++ b/test/dm/ram.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <ram.h>
#include <asm/global_data.h>
diff --git a/test/dm/read.c b/test/dm/read.c
index 4ecf181..7768aa2 100644
--- a/test/dm/read.c
+++ b/test/dm/read.c
@@ -3,6 +3,7 @@
* Copyright (c) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
*/
+#include <common.h>
#include <dm.h>
#include <dm/device.h>
#include <dm/ofnode.h>
diff --git a/test/dm/reboot-mode.c b/test/dm/reboot-mode.c
index 160b4da..fbb9c3a 100644
--- a/test/dm/reboot-mode.c
+++ b/test/dm/reboot-mode.c
@@ -3,6 +3,7 @@
* (C) 2018 Theobroma Systems Design und Consulting GmbH
*/
+#include <common.h>
#include <dm.h>
#include <reboot-mode/reboot-mode.h>
#include <env.h>
diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index 1398f8f..8560f2a 100644
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -3,13 +3,13 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <log.h>
#include <mapmem.h>
#include <regmap.h>
#include <syscon.h>
#include <rand.h>
-#include <time.h>
#include <asm/test.h>
#include <dm/test.h>
#include <dm/devres.h>
diff --git a/test/dm/regulator.c b/test/dm/regulator.c
index 9e45fd1..86f4862 100644
--- a/test/dm/regulator.c
+++ b/test/dm/regulator.c
@@ -6,6 +6,7 @@
* Przemyslaw Marczak <p.marczak@samsung.com>
*/
+#include <common.h>
#include <errno.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index ef9e8e5..f6f9e50 100644
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -3,8 +3,7 @@
* (C) Copyright 2015
* Texas Instruments Incorporated - https://www.ti.com/
*/
-
-#include <config.h>
+#include <common.h>
#include <dm.h>
#include <elf.h>
#include <errno.h>
diff --git a/test/dm/reset.c b/test/dm/reset.c
index d3158bf..e2d6f45 100644
--- a/test/dm/reset.c
+++ b/test/dm/reset.c
@@ -3,6 +3,7 @@
* Copyright (c) 2016, NVIDIA CORPORATION.
*/
+#include <common.h>
#include <dm.h>
#include <dm/device-internal.h>
#include <log.h>
diff --git a/test/dm/rkmtd.c b/test/dm/rkmtd.c
index 3dc9ca1..3c3e8ef 100644
--- a/test/dm/rkmtd.c
+++ b/test/dm/rkmtd.c
@@ -8,6 +8,7 @@
* Copyright (C) 2023 Johan Jonker <jbx6244@gmail.com>
*/
+#include <common.h>
#include <blk.h>
#include <dm.h>
#include <fs.h>
diff --git a/test/dm/rng.c b/test/dm/rng.c
index c8ed6ca..6d1f688 100644
--- a/test/dm/rng.c
+++ b/test/dm/rng.c
@@ -3,6 +3,7 @@
* Copyright (c) 2019, Linaro Limited
*/
+#include <common.h>
#include <dm.h>
#include <log.h>
#include <rng.h>
diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index a8aa419..bf97dbb 100644
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <console.h>
#include <dm.h>
#include <i2c.h>
diff --git a/test/dm/scmi.c b/test/dm/scmi.c
index 69fc900..adf36ff 100644
--- a/test/dm/scmi.c
+++ b/test/dm/scmi.c
@@ -12,6 +12,7 @@
* unknown SCMI protocol ID.
*/
+#include <common.h>
#include <clk.h>
#include <dm.h>
#include <reset.h>
diff --git a/test/dm/scsi.c b/test/dm/scsi.c
index 5180159..380cfc8 100644
--- a/test/dm/scsi.c
+++ b/test/dm/scsi.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <part.h>
#include <scsi.h>
diff --git a/test/dm/serial.c b/test/dm/serial.c
index 34c0d4d..34b783e 100644
--- a/test/dm/serial.c
+++ b/test/dm/serial.c
@@ -3,6 +3,7 @@
* Copyright (c) 2018, STMicroelectronics
*/
+#include <common.h>
#include <log.h>
#include <serial.h>
#include <dm.h>
diff --git a/test/dm/sf.c b/test/dm/sf.c
index 0e3a0f1..17d43fe 100644
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -3,6 +3,7 @@
* Copyright (C) 2013 Google, Inc
*/
+#include <common.h>
#include <command.h>
#include <dm.h>
#include <fdtdec.h>
diff --git a/test/dm/simple-bus.c b/test/dm/simple-bus.c
index 8a730ba..3530b47 100644
--- a/test/dm/simple-bus.c
+++ b/test/dm/simple-bus.c
@@ -3,6 +3,7 @@
* Copyright (C) 2021, Bin Meng <bmeng.cn@gmail.com>
*/
+#include <common.h>
#include <dm.h>
#include <dm/test.h>
#include <dm/simple_bus.h>
diff --git a/test/dm/simple-pm-bus.c b/test/dm/simple-pm-bus.c
index 9949cb3..792c745 100644
--- a/test/dm/simple-pm-bus.c
+++ b/test/dm/simple-pm-bus.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020 Sean Anderson <seanga2@gmail.com>
*/
+#include <common.h>
#include <dm.h>
#include <dm/test.h>
#include <dm/device-internal.h>
diff --git a/test/dm/sm.c b/test/dm/sm.c
index 4d95c2a..7ebb0c9 100644
--- a/test/dm/sm.c
+++ b/test/dm/sm.c
@@ -5,6 +5,7 @@
* Author: Alexey Romanov <avromanov@salutedevices.com>
*/
+#include <common.h>
#include <dm.h>
#include <sm.h>
#include <sandbox-sm.h>
diff --git a/test/dm/smem.c b/test/dm/smem.c
index adcbfe5..289fb59 100644
--- a/test/dm/smem.c
+++ b/test/dm/smem.c
@@ -3,6 +3,7 @@
* Copyright (C) 2018 Ramon Fried <ramon.fried@gmail.com>
*/
+#include <common.h>
#include <dm.h>
#include <smem.h>
#include <dm/test.h>
diff --git a/test/dm/soc.c b/test/dm/soc.c
index cb0ac15..8f6c97f 100644
--- a/test/dm/soc.c
+++ b/test/dm/soc.c
@@ -6,6 +6,7 @@
* Dave Gerlach <d-gerlach@ti.com>
*/
+#include <common.h>
#include <dm.h>
#include <dm/test.h>
#include <dm/uclass-internal.h>
diff --git a/test/dm/sound.c b/test/dm/sound.c
index f4e6215..15d545a 100644
--- a/test/dm/sound.c
+++ b/test/dm/sound.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <dm.h>
#include <sound.h>
#include <dm/test.h>
diff --git a/test/dm/spi.c b/test/dm/spi.c
index 1ab2dd7..325799b 100644
--- a/test/dm/spi.c
+++ b/test/dm/spi.c
@@ -3,6 +3,7 @@
* Copyright (C) 2013 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <fdtdec.h>
#include <spi.h>
diff --git a/test/dm/spmi.c b/test/dm/spmi.c
index e10ae8d..97bb0eb 100644
--- a/test/dm/spmi.c
+++ b/test/dm/spmi.c
@@ -3,6 +3,7 @@
* (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
*/
+#include <common.h>
#include <fdtdec.h>
#include <dm.h>
#include <malloc.h>
diff --git a/test/dm/syscon-reset.c b/test/dm/syscon-reset.c
index ba19504..eeaddf8 100644
--- a/test/dm/syscon-reset.c
+++ b/test/dm/syscon-reset.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020 Sean Anderson <seanga2@gmail.com>
*/
+#include <common.h>
#include <dm.h>
#include <dm/test.h>
#include <regmap.h>
diff --git a/test/dm/syscon.c b/test/dm/syscon.c
index 04d324e..be23297 100644
--- a/test/dm/syscon.c
+++ b/test/dm/syscon.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <log.h>
#include <syscon.h>
diff --git a/test/dm/sysinfo-gpio.c b/test/dm/sysinfo-gpio.c
index 24a99da..2e494b3 100644
--- a/test/dm/sysinfo-gpio.c
+++ b/test/dm/sysinfo-gpio.c
@@ -3,6 +3,7 @@
* Copyright (C) 2021 Sean Anderson <sean.anderson@seco.com>
*/
+#include <common.h>
#include <dm.h>
#include <log.h>
#include <sysinfo.h>
diff --git a/test/dm/sysinfo.c b/test/dm/sysinfo.c
index 7444a58..96b3a8e 100644
--- a/test/dm/sysinfo.c
+++ b/test/dm/sysinfo.c
@@ -4,6 +4,7 @@
* Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc
*/
+#include <common.h>
#include <dm.h>
#include <log.h>
#include <dm/test.h>
diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c
index f3a859b..5aa69e0 100644
--- a/test/dm/sysreset.c
+++ b/test/dm/sysreset.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <sysreset.h>
#include <asm/state.h>
diff --git a/test/dm/tag.c b/test/dm/tag.c
index bce8a35..8ae8a1f 100644
--- a/test/dm/tag.c
+++ b/test/dm/tag.c
@@ -6,6 +6,7 @@
* Author: AKASHI Takahiro
*/
+#include <common.h>
#include <dm/tag.h>
#include <dm/test.h> /* DM_TEST() */
#include <test/test.h> /* struct unit_test_state */
diff --git a/test/dm/tee.c b/test/dm/tee.c
index bb02a9b..7a11bf8 100644
--- a/test/dm/tee.c
+++ b/test/dm/tee.c
@@ -3,6 +3,7 @@
* Copyright (C) 2018 Linaro Limited
*/
+#include <common.h>
#include <dm.h>
#include <log.h>
#include <malloc.h>
diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c
index 4bc2c45..e73a1dd 100644
--- a/test/dm/test-dm.c
+++ b/test/dm/test-dm.c
@@ -3,6 +3,7 @@
* Copyright (c) 2013 Google, Inc
*/
+#include <common.h>
#include <test/suites.h>
#include <test/test.h>
diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c
index 851177c..02cb974 100644
--- a/test/dm/test-driver.c
+++ b/test/dm/test-driver.c
@@ -6,6 +6,7 @@
* Pavel Herrmann <morpheus.ibis@gmail.com>
*/
+#include <common.h>
#include <dm.h>
#include <errno.h>
#include <log.h>
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 18c89ee..72d0eb5 100644
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -3,6 +3,7 @@
* Copyright (c) 2013 Google, Inc
*/
+#include <common.h>
#include <dm.h>
#include <errno.h>
#include <fdtdec.h>
diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c
index 9a80cc6..0677017 100644
--- a/test/dm/test-uclass.c
+++ b/test/dm/test-uclass.c
@@ -6,6 +6,7 @@
* Pavel Herrmann <morpheus.ibis@gmail.com>
*/
+#include <common.h>
#include <log.h>
#include <malloc.h>
#include <dm.h>
diff --git a/test/dm/timer.c b/test/dm/timer.c
index 7fcefc4..9f94d47 100644
--- a/test/dm/timer.c
+++ b/test/dm/timer.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Thomas Chou <thomas@wytron.com.tw>
*/
+#include <common.h>
#include <dm.h>
#include <timer.h>
#include <dm/test.h>
diff --git a/test/dm/tpm.c b/test/dm/tpm.c
index 0e413c0..cde933a 100644
--- a/test/dm/tpm.c
+++ b/test/dm/tpm.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <dm.h>
#include <tpm_api.h>
#include <dm/test.h>
diff --git a/test/dm/usb.c b/test/dm/usb.c
index 9a57193..7671ef1 100644
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -3,6 +3,7 @@
* Copyright (C) 2015 Google, Inc
*/
+#include <common.h>
#include <console.h>
#include <dm.h>
#include <part.h>
diff --git a/test/dm/video.c b/test/dm/video.c
index 7dfbeb9..d907f68 100644
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -4,6 +4,7 @@
* Written by Simon Glass <sjg@chromium.org>
*/
+#include <common.h>
#include <bzlib.h>
#include <dm.h>
#include <gzip.h>
diff --git a/test/dm/virtio.c b/test/dm/virtio.c
index 3efd7c7..3e108cd 100644
--- a/test/dm/virtio.c
+++ b/test/dm/virtio.c
@@ -3,6 +3,7 @@
* Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
*/
+#include <common.h>
#include <dm.h>
#include <virtio_types.h>
#include <virtio.h>
diff --git a/test/dm/virtio_device.c b/test/dm/virtio_device.c
index 63dc534..fdda4da 100644
--- a/test/dm/virtio_device.c
+++ b/test/dm/virtio_device.c
@@ -3,6 +3,7 @@
* Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
*/
+#include <common.h>
#include <dm.h>
#include <virtio_types.h>
#include <virtio.h>
diff --git a/test/dm/virtio_rng.c b/test/dm/virtio_rng.c
index ab7d862..8b9a04b 100644
--- a/test/dm/virtio_rng.c
+++ b/test/dm/virtio_rng.c
@@ -4,6 +4,7 @@
* Written by Andrew Scull <ascull@google.com>
*/
+#include <common.h>
#include <dm.h>
#include <virtio_types.h>
#include <virtio.h>
diff --git a/test/dm/wdt.c b/test/dm/wdt.c
index 1df2da2..2bbebcd 100644
--- a/test/dm/wdt.c
+++ b/test/dm/wdt.c
@@ -3,9 +3,9 @@
* Copyright 2017 Google, Inc
*/
+#include <common.h>
#include <cyclic.h>
#include <dm.h>
-#include <time.h>
#include <wdt.h>
#include <asm/gpio.h>
#include <asm/state.h>