dm: core: Drop header files from dm/test.h

These header file should not be included in other header files. Remove
them and add to each individual file. Add test/test.h to test/ui.h since
that is a reasonable place.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/dm/test.h b/include/dm/test.h
index d39686cde28aa4f68295fa7b98502f794c58fcfd..2c92d412781ac3c80c403651878896807433deab 100644 (file)
--- a/include/dm/test.h
+++ b/include/dm/test.h
@@ -6,9 +6,6 @@
 #ifndef __DM_TEST_H
 #define __DM_TEST_H
 
-#include <dm.h>
-#include <test/test.h>
-
 /**
  * struct dm_test_cdata - configuration data for test instance
  *

diff --git a/include/test/ut.h b/include/test/ut.h
index 99bbb1230c76c8f7f12b5f6265deba9a537107b5..6ab2f8830df1f1c38554d6d4a1e0a11245725492 100644 (file)
--- a/include/test/ut.h
+++ b/include/test/ut.h
@@ -11,6 +11,7 @@
 #include <command.h>
 #include <hexdump.h>
 #include <linux/err.h>
+#include <test/test.h>
 
 struct unit_test_state;
 

diff --git a/test/dm/adc.c b/test/dm/adc.c
index da7bd4bf1f96fe19d4ede2c4040f5210ca11f417..7fa1d48dd9a12508aa8e7c2632241567c7269a5e 100644 (file)
--- a/test/dm/adc.c
+++ b/test/dm/adc.c
@@ -17,6 +17,7 @@
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
 #include <sandbox-adc.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_adc_bind(struct unit_test_state *uts)

diff --git a/test/dm/audio.c b/test/dm/audio.c
index 77c3a3625bd51d7be8e589ed712ad76687807cfe..4bb86e3214cd7fd62f496f3197f446e463ba72e4 100644 (file)
--- a/test/dm/audio.c
+++ b/test/dm/audio.c
@@ -8,6 +8,7 @@
 #include <audio_codec.h>
 #include <dm.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 #include <asm/test.h>
 

diff --git a/test/dm/axi.c b/test/dm/axi.c
index e1155a51dd7e542484a8a1caa41d94be59d1d0ef..5b1bbab0b811df3a7edd5cd5b80e9667e193c0a4 100644 (file)
--- a/test/dm/axi.c
+++ b/test/dm/axi.c
@@ -8,9 +8,10 @@
 #include <axi.h>
 #include <dm.h>
 #include <log.h>
+#include <asm/axi.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
-#include <asm/axi.h>
 
 /* Test that sandbox AXI works correctly */
 static int dm_test_axi_base(struct unit_test_state *uts)

diff --git a/test/dm/blk.c b/test/dm/blk.c
index 94b2855b8e9efa9aa5736022c08aba9474ead81f..80d671e561672167fc2242fa34ed75584fd8e8ed 100644 (file)
--- a/test/dm/blk.c
+++ b/test/dm/blk.c
@@ -9,6 +9,7 @@
 #include <usb.h>
 #include <asm/state.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/test/dm/board.c b/test/dm/board.c
index 5472c65fad61206e1fa1da5174f5984b0e46d529..ff50d6c38bce3883032e0a0c14631f8136682e4e 100644 (file)
--- a/test/dm/board.c
+++ b/test/dm/board.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <dm/test.h>
 #include <board.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 #include "../../drivers/board/sandbox.h"

diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c
index be0c27890706f1ffef472f13d78699a939fe8dac..9fd3751ef7e15e47c63158fc762e2408c3285642 100644 (file)
--- a/test/dm/bootcount.c
+++ b/test/dm/bootcount.c
@@ -9,6 +9,7 @@
 #include <log.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_bootcount(struct unit_test_state *uts)

diff --git a/test/dm/bus.c b/test/dm/bus.c
index 73eb3aede3d6752e8da19697c4df6fef6d0f1b35..07072673613724fb75dc0773bc46f8b436744b0c 100644 (file)
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -14,6 +14,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/test/dm/clk.c b/test/dm/clk.c
index 48fc3dd714ccd1a369d42641861b71decaadde81..7a39760f258a36379fe4d18c233bf0fe85d94bec 100644 (file)
--- a/test/dm/clk.c
+++ b/test/dm/clk.c
@@ -12,6 +12,7 @@
 #include <dm/test.h>
 #include <dm/device-internal.h>
 #include <linux/err.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Base test of the clk uclass */

diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c
index ae3a4d8a76a429caee686eb5b0edc526dae660dc..da2292a51a9534e601d11a2cd919736ae9392472 100644 (file)
--- a/test/dm/clk_ccf.c
+++ b/test/dm/clk_ccf.c
@@ -11,6 +11,7 @@
 #include <dm/test.h>
 #include <dm/uclass.h>
 #include <linux/err.h>
+#include <test/test.h>
 #include <test/ut.h>
 #include <sandbox-clk.h>
 

diff --git a/test/dm/core.c b/test/dm/core.c
index d20c48443f656962230233d5ece8f4ca0e7bb30b..9b73ec3aa644ef8ed1d688e772aa949c38c556b4 100644 (file)
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -16,6 +16,7 @@
 #include <dm/util.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/test/dm/cpu.c b/test/dm/cpu.c
index 46683d884a4e35855f41df4e81c61f80276cb4db..0a75c9108722ee00a0dd6ed3ae23cece4480d7aa 100644 (file)
--- a/test/dm/cpu.c
+++ b/test/dm/cpu.c
@@ -10,6 +10,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <cpu.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_cpu(struct unit_test_state *uts)

diff --git a/test/dm/dma.c b/test/dm/dma.c
index 317ed4fe8c691b135737103f0faad5a1dfb85d7c..1cdc813619f13b5f3b4bdd382bff45ecb4e7a893 100644 (file)
--- a/test/dm/dma.c
+++ b/test/dm/dma.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <dma.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_dma_m2m(struct unit_test_state *uts)

diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c
index 59fcd5558f07e5cad2a67ac7005533dbf1b825cc..97917a17c1eead83f29d174003ea0523f493ee37 100644 (file)
--- a/test/dm/dsi_host.c
+++ b/test/dm/dsi_host.c
@@ -10,6 +10,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_dsi_host_phy_init(void *priv_data)

diff --git a/test/dm/eth.c b/test/dm/eth.c
index b58c9640a277618ac994c756ab701ef9f5a24ab5..1a3eb1839cea923922287eb1349eb09de1905f4f 100644 (file)
--- a/test/dm/eth.c
+++ b/test/dm/eth.c
@@ -13,10 +13,11 @@
 #include <log.h>
 #include <malloc.h>
 #include <net.h>
+#include <asm/eth.h>
 #include <dm/test.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
-#include <asm/eth.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 #define DM_TEST_ETH_NUM                4

diff --git a/test/dm/firmware.c b/test/dm/firmware.c
index 60fdcbb33f4a5748e35a469821d12362055e685e..2b4f49af80b540ef5699e51a01a842f3430a78d8 100644 (file)
--- a/test/dm/firmware.c
+++ b/test/dm/firmware.c
@@ -8,6 +8,7 @@
 #include <syscon.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Base test of firmware probe */

diff --git a/test/dm/gpio.c b/test/dm/gpio.c
index b7ee8fc3caebd4f13126db38a7b73d79f6c2e537..f3c467e9ac74e4624d1999d4a544cf703076388f 100644 (file)
--- a/test/dm/gpio.c
+++ b/test/dm/gpio.c
@@ -9,10 +9,11 @@
 #include <log.h>
 #include <malloc.h>
 #include <acpi/acpi_device.h>
+#include <asm/gpio.h>
 #include <dm/root.h>
 #include <dm/test.h>
 #include <dm/util.h>
-#include <asm/gpio.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Test that sandbox GPIOs work correctly */

diff --git a/test/dm/hwspinlock.c b/test/dm/hwspinlock.c
index 09ec38b4f37fccaa5d827afe2d60fa64fbf8dd16..49c52bcd630f19e3fdf4be4d66d014d43815d480 100644 (file)
--- a/test/dm/hwspinlock.c
+++ b/test/dm/hwspinlock.c
@@ -9,6 +9,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Test that hwspinlock driver functions are called */

diff --git a/test/dm/i2c.c b/test/dm/i2c.c
index 2025c4216d0d91722fe26f684d41cb1cd0563925..25b2c7c6176cae3373890697976f93d5f3bbc514 100644 (file)
--- a/test/dm/i2c.c
+++ b/test/dm/i2c.c
@@ -16,6 +16,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
 #include <hexdump.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static const int busnum;

diff --git a/test/dm/i2s.c b/test/dm/i2s.c
index 49ebc3523c005870a708ad5fc25277ae05126b38..7a017be0649ed850a48bac9151b52aa17d9d5b73 100644 (file)
--- a/test/dm/i2s.c
+++ b/test/dm/i2s.c
@@ -7,9 +7,10 @@
 #include <common.h>
 #include <dm.h>
 #include <i2s.h>
+#include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
-#include <asm/test.h>
 
 /* Basic test of the i2s codec uclass */
 static int dm_test_i2s(struct unit_test_state *uts)

diff --git a/test/dm/led.c b/test/dm/led.c
index 00de7b3997c87490a30a4b99eb27f1040e86f1cb..3d5ad9363b468a727f02c814659423a4274967c0 100644 (file)
--- a/test/dm/led.c
+++ b/test/dm/led.c
@@ -8,6 +8,7 @@
 #include <led.h>
 #include <asm/gpio.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Base test of the led uclass */

diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c
index e6c521b8b5429b1eede509026dcd105cffdaa26e..e9c8ab1a95b8941e86aba3655812ab95a1e74198 100644 (file)
--- a/test/dm/mailbox.c
+++ b/test/dm/mailbox.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <asm/mbox.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_mailbox(struct unit_test_state *uts)

diff --git a/test/dm/mdio.c b/test/dm/mdio.c
index ba1b54f27e272a25df5c392cda97e49f9a27ef8f..758bbb2cc51457a25b407c45590b11d2e33debb9 100644 (file)
--- a/test/dm/mdio.c
+++ b/test/dm/mdio.c
@@ -7,10 +7,11 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
-#include <dm/test.h>
+#include <miiphy.h>
 #include <misc.h>
+#include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
-#include <miiphy.h>
 
 /* macros copied over from mdio_sandbox.c */
 #define SANDBOX_PHY_ADDR       5

diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c
index f962e09dbc23c3401e6362e5dffeeb910742ae10..0b3f85a53be1291d5e1fe47c5e397daba50c51e3 100644 (file)
--- a/test/dm/mdio_mux.c
+++ b/test/dm/mdio_mux.c
@@ -6,10 +6,11 @@
 
 #include <common.h>
 #include <dm.h>
-#include <dm/test.h>
+#include <miiphy.h>
 #include <misc.h>
+#include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
-#include <miiphy.h>
 
 /* macros copied over from mdio_sandbox.c */
 #define SANDBOX_PHY_ADDR       5

diff --git a/test/dm/misc.c b/test/dm/misc.c
index 26fd6acecb9a73b8b67655095808be13ab80c924..641070972d8cf59ea3fb8e97e1fd62d7c2c5ecf0 100644 (file)
--- a/test/dm/misc.c
+++ b/test/dm/misc.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <dm/test.h>
 #include <misc.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_misc(struct unit_test_state *uts)

diff --git a/test/dm/mmc.c b/test/dm/mmc.c
index 49402b9c90298c59644f1fce3093ce5e1e2d5c37..8e1fd3fe51a746c82970ff2db0455aebcd8c5a2a 100644 (file)
--- a/test/dm/mmc.c
+++ b/test/dm/mmc.c
@@ -8,6 +8,7 @@
 #include <mmc.h>
 #include <part.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /*

diff --git a/test/dm/nop.c b/test/dm/nop.c
index 2df29f3d15b25aae624e85b1707db5655930cc85..8b3b646892761188defc3283145e0d5351d2cdee 100644 (file)
--- a/test/dm/nop.c
+++ b/test/dm/nop.c
@@ -13,6 +13,7 @@
 #include <dm/device.h>
 #include <dm/test.h>
 #include <misc.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int noptest_bind(struct udevice *parent)

diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index 1114f34cbf8dbb4bb6016f66f36815b922ed4e92..e01acc4fe92250a47b79c36ec0f3676f3987eedf 100644 (file)
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -5,6 +5,7 @@
 #include <log.h>
 #include <dm/of_extra.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_ofnode_compatible(struct unit_test_state *uts)

diff --git a/test/dm/osd.c b/test/dm/osd.c
index 5739dfa0b8f2bcfdac86d2de20eda3135d15a8bf..8784867ecbc431aedaa5f6fa87f130e119e13961 100644 (file)
--- a/test/dm/osd.c
+++ b/test/dm/osd.c
@@ -7,10 +7,11 @@
 #include <common.h>
 #include <display_options.h>
 #include <dm.h>
-#include <dm/test.h>
-#include <test/ut.h>
 #include <video_osd.h>
 #include <asm/test.h>
+#include <dm/test.h>
+#include <test/test.h>
+#include <test/ut.h>
 
 #include "../../drivers/video/sandbox_osd.h"
 

diff --git a/test/dm/panel.c b/test/dm/panel.c
index 7e4ebd6d81e6f6163878f07919cd92873d5b2fa8..410e8f3907fa32aafa258c2a715321ddd08d8f05 100644 (file)
--- a/test/dm/panel.c
+++ b/test/dm/panel.c
@@ -14,8 +14,9 @@
 #include <asm/gpio.h>
 #include <asm/test.h>
 #include <dm/test.h>
-#include <test/ut.h>
 #include <power/regulator.h>
+#include <test/test.h>
+#include <test/ut.h>
 
 /* Basic test of the panel uclass */
 static int dm_test_panel(struct unit_test_state *uts)

diff --git a/test/dm/pch.c b/test/dm/pch.c
index 54e33d187b61dda2c0bf2fb95c701827f3ac9ffa..bf17a31ccf97d7b59d4937a3e2461a7b935f3973 100644 (file)
--- a/test/dm/pch.c
+++ b/test/dm/pch.c
@@ -8,6 +8,7 @@
 #include <pch.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Test that sandbox PCH works correctly */

diff --git a/test/dm/pci.c b/test/dm/pci.c
index 39e82b3699f8af969fd84ffb911de29ba82118b8..a492fc03553a4d0d167c5285b080d0723b494779 100644 (file)
--- a/test/dm/pci.c
+++ b/test/dm/pci.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Test that sandbox PCI works correctly */

diff --git a/test/dm/pci_ep.c b/test/dm/pci_ep.c
index 101f86175135f7af1876ebf0d1f8e21edf37dab0..a29d00eebeaf184c5fbcdbb39923886ed0b4aa89 100644 (file)
--- a/test/dm/pci_ep.c
+++ b/test/dm/pci_ep.c
@@ -5,12 +5,13 @@
 
 #include <common.h>
 #include <dm.h>
+#include <hexdump.h>
+#include <pci_ep.h>
 #include <asm/io.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
-#include <hexdump.h>
-#include <pci_ep.h>
 
 /* Test that sandbox PCI EP works correctly */
 static int dm_test_pci_ep_base(struct unit_test_state *uts)

diff --git a/test/dm/phy.c b/test/dm/phy.c
index 99f011955780bb4a0f7ad921b310145404a137a8..1a59899327a18c6c5f1012052489bcc846c3f5a5 100644 (file)
--- a/test/dm/phy.c
+++ b/test/dm/phy.c
@@ -9,6 +9,7 @@
 #include <generic-phy.h>
 #include <log.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Base test of the phy uclass */

diff --git a/test/dm/pmic.c b/test/dm/pmic.c
index b582329a9c599b9d302244ec1dd7fb78d409de8f..8c2766aeac67bcfad5f6d73c1c8b9522b1fa8c54 100644 (file)
--- a/test/dm/pmic.c
+++ b/test/dm/pmic.c
@@ -10,16 +10,17 @@
 #include <errno.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <fsl_pmic.h>
 #include <malloc.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
-#include <dm/util.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <dm/util.h>
 #include <power/pmic.h>
 #include <power/sandbox_pmic.h>
+#include <test/test.h>
 #include <test/ut.h>
-#include <fsl_pmic.h>
 
 /* Test PMIC get method */
 

diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c
index 8baf5d09d1d235c184642012b8c7c6b18fe0f88d..52f88c5a3606766162be33816f1053cd48ac9ece 100644 (file)
--- a/test/dm/power-domain.c
+++ b/test/dm/power-domain.c
@@ -8,6 +8,7 @@
 #include <malloc.h>
 #include <dm/test.h>
 #include <asm/power-domain.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* This must match the specifier for power-domains in the DT node */

diff --git a/test/dm/pwm.c b/test/dm/pwm.c
index b52ee21a69eca3c975cdad0b870bda7f487d6e2b..8cc911e1add5b918fac037ec5d07d959d3ffa4cc 100644 (file)
--- a/test/dm/pwm.c
+++ b/test/dm/pwm.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <pwm.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Basic test of the pwm uclass */

diff --git a/test/dm/ram.c b/test/dm/ram.c
index 3efdb6b80b253651cf839e24960c80443ea18fea..2456466b56194305bda3446b62602a81737bfe96 100644 (file)
--- a/test/dm/ram.c
+++ b/test/dm/ram.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <ram.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/test/dm/regmap.c b/test/dm/regmap.c
index 809494d585eea4258ea2f5defc8ef5c043f6b448..42cc4cb0c065b323072f2c1c4cc16ab1ed76d462 100644 (file)
--- a/test/dm/regmap.c
+++ b/test/dm/regmap.c
@@ -12,6 +12,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/err.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Base test of register maps */

diff --git a/test/dm/regulator.c b/test/dm/regulator.c
index ca916eeebb67835703bac8594d62d4dc397463fe..f412ec20c530f7ba08a2224d0a3bd4107c072f7e 100644 (file)
--- a/test/dm/regulator.c
+++ b/test/dm/regulator.c
@@ -20,6 +20,7 @@
 #include <power/pmic.h>
 #include <power/regulator.h>
 #include <power/sandbox_pmic.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 enum {

diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c
index 9511c7dd6f5576b62de6cc1bb6e971c368c18e53..c6bf2c4c465c08faf8041e6ab11494656361dc05 100644 (file)
--- a/test/dm/remoteproc.c
+++ b/test/dm/remoteproc.c
@@ -10,7 +10,9 @@
 #include <remoteproc.h>
 #include <asm/io.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
+
 /**
  * dm_test_remoteproc_base() - test the operations after initializations
  * @uts:       unit test state

diff --git a/test/dm/reset.c b/test/dm/reset.c
index 871d6400a07346ca5d441408da95d29aed410291..82328072644b81bab7267ca3a916a9c0afd445be 100644 (file)
--- a/test/dm/reset.c
+++ b/test/dm/reset.c
@@ -10,6 +10,7 @@
 #include <reset.h>
 #include <dm/test.h>
 #include <asm/reset.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* This must match the specifier for mbox-names="test" in the DT node */

diff --git a/test/dm/rtc.c b/test/dm/rtc.c
index dd037a6e17abad1b1ab3bf156b5900f05ed28f7e..42a9195b7316125688f76c4a680d601199af3435 100644 (file)
--- a/test/dm/rtc.c
+++ b/test/dm/rtc.c
@@ -14,6 +14,7 @@
 #include <asm/rtc.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Simple RTC sanity check */

diff --git a/test/dm/serial.c b/test/dm/serial.c
index 6237693cb804df563f041610231546dc0d80948b..a1b122ec1dcbc292f82ea36d9772da384c4e46b1 100644 (file)
--- a/test/dm/serial.c
+++ b/test/dm/serial.c
@@ -8,6 +8,7 @@
 #include <serial.h>
 #include <dm.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int dm_test_serial(struct unit_test_state *uts)

diff --git a/test/dm/sf.c b/test/dm/sf.c
index 9e7dead684d34a0158aa3b0fde522fb389b8866a..0f2808fca48a13312067090e921b162fa1a09d35 100644 (file)
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -15,6 +15,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <dm/util.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Simple test of sandbox SPI flash */

diff --git a/test/dm/smem.c b/test/dm/smem.c
index 4099a5f66c49ac3562ac6696df0693a661aa5a2f..21dd96e4092db1cdf210a2347af69bea3b641e75 100644 (file)
--- a/test/dm/smem.c
+++ b/test/dm/smem.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <smem.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Basic test of the smem uclass */

diff --git a/test/dm/sound.c b/test/dm/sound.c
index aa5368f05b9da0f699c2737bef9025faad5a4668..9cb9961058bd10db0eca4c84cc9d767feafefccc 100644 (file)
--- a/test/dm/sound.c
+++ b/test/dm/sound.c
@@ -9,6 +9,7 @@
 #include <sound.h>
 #include <dm/test.h>
 #include <test/ut.h>
+#include <test/test.h>
 #include <asm/test.h>
 
 /* Basic test of the sound codec uclass */

diff --git a/test/dm/spi.c b/test/dm/spi.c
index ff2cddd24593ba116fe46c3d3f81be0afda54a12..10b89e7acfec54dd6fe018f3b4a5dfd1e61267f4 100644 (file)
--- a/test/dm/spi.c
+++ b/test/dm/spi.c
@@ -13,6 +13,7 @@
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Test that we can find buses and chip-selects */

diff --git a/test/dm/spmi.c b/test/dm/spmi.c
index 668b7e133ff8ec46474ac2beea677b7fe52e03c2..4aae1f166d27a75b9c6798dc1ddbedb636fd6f5f 100644 (file)
--- a/test/dm/spmi.c
+++ b/test/dm/spmi.c
@@ -14,6 +14,7 @@
 #include <power/pmic.h>
 #include <spmi/spmi.h>
 #include <asm/gpio.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Test if bus childs got probed propperly*/

diff --git a/test/dm/syscon.c b/test/dm/syscon.c
index 06a1c69ac5cb2c3be1968440e8de47a52a2617e6..b2d0ade95ee0615d7f0e656dee9db2e13331cd94 100644 (file)
--- a/test/dm/syscon.c
+++ b/test/dm/syscon.c
@@ -11,6 +11,7 @@
 #include <asm/test.h>
 #include <dm/test.h>
 #include <linux/err.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Base test of system controllers */

diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c
index 5b2358ef674c5651936d94b4af35530d3e64d41a..e5cd18cd82e48a2dc167ca8c1e4572897ba5a81f 100644 (file)
--- a/test/dm/sysreset.c
+++ b/test/dm/sysreset.c
@@ -9,6 +9,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Test that we can use particular sysreset devices */

diff --git a/test/dm/tee.c b/test/dm/tee.c
index 632e9960b0b08d190be3d59ac54bfae4026b16c5..fec9551fb27cc38af45a1a41ddefac6447c3cce8 100644 (file)
--- a/test/dm/tee.c
+++ b/test/dm/tee.c
@@ -10,6 +10,7 @@
 #include <dm/test.h>
 #include <sandboxtee.h>
 #include <tee.h>
+#include <test/test.h>
 #include <test/ut.h>
 #include <tee/optee_ta_avb.h>
 

diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c
index ba85fa313e8e2cb8d1b42c13d155d40272c36c71..08bdf011946fe444f9486fd5f2c285f669dbf512 100644 (file)
--- a/test/dm/test-driver.c
+++ b/test/dm/test-driver.c
@@ -11,9 +11,10 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
+#include <asm/io.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
-#include <asm/io.h>
 
 int dm_testdrv_op_count[DM_TEST_OP_COUNT];
 static struct unit_test_state *uts = &global_dm_test_state;

diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 8ef7c7a88e8945244a0a5148d4e0b04a11642b63..c64ac405ede2e3b7f4777070437cc5006d0de88e 100644 (file)
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -18,6 +18,7 @@
 #include <dm/util.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 53e5ca321fe98c980d83db74e416167b2c840f60..6d197d0d610fe6db6ca0a45626eff9942fafac69 100644 (file)
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -14,6 +14,8 @@
 #include <dm/test.h>
 #include <dm/root.h>
 #include <dm/uclass-internal.h>
+#include <test/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c
index b6d629a285ce9d13547518b919a4a943d71dbfe1..760731b0667580f8202553a5c0ef75d900ae5335 100644 (file)
--- a/test/dm/test-uclass.c
+++ b/test/dm/test-uclass.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <dm/test.h>
 #include <linux/list.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static struct unit_test_state *uts = &global_dm_test_state;

diff --git a/test/dm/timer.c b/test/dm/timer.c
index 9367dab5d5ef7d636422a144e704e3c3042228f1..4aa5eeac75b2548fee81c54e43c1a958bf38bb69 100644 (file)
--- a/test/dm/timer.c
+++ b/test/dm/timer.c
@@ -7,6 +7,7 @@
 #include <dm.h>
 #include <timer.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /*

diff --git a/test/dm/usb.c b/test/dm/usb.c
index b273a515efd2be5025641a784c3c4c9e935e1e81..6cbb66c82b7414ccf2a8a83f9b67a7347139ea48 100644 (file)
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -14,6 +14,7 @@
 #include <dm/device-internal.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 struct keyboard_test_data {

diff --git a/test/dm/video.c b/test/dm/video.c
index 19f78b6239084232bc30c4609e499cde9017558a..9523a0173dc997ca7a0344623f9a5aa26e0d727f 100644 (file)
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -15,6 +15,7 @@
 #include <video_console.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /*

diff --git a/test/dm/virtio.c b/test/dm/virtio.c
index 4a0c0b23b88ecf6fae1a60469335c2edad945468..6361cd53339658311d7c3a190e6730d460afcd23 100644 (file)
--- a/test/dm/virtio.c
+++ b/test/dm/virtio.c
@@ -9,9 +9,10 @@
 #include <virtio.h>
 #include <virtio_ring.h>
 #include <dm/device-internal.h>
-#include <dm/uclass-internal.h>
 #include <dm/root.h>
 #include <dm/test.h>
+#include <dm/uclass-internal.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Basic test of the virtio uclass */

diff --git a/test/dm/wdt.c b/test/dm/wdt.c
index 1d31ec55c64d5b701383ba18fa7b0ac077b6a029..c704098b24c3a60ba0340cd1ced1771ee86e84bd 100644 (file)
--- a/test/dm/wdt.c
+++ b/test/dm/wdt.c
@@ -9,6 +9,7 @@
 #include <asm/state.h>
 #include <asm/test.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 /* Test that watchdog driver functions are called */

diff --git a/test/lib/lmb.c b/test/lib/lmb.c
index a0fe0f6b339b7ed050f6b5d1799bdf5ab182d699..a3449875096aba94c2087edcf0d13f5050ae3134 100644 (file)
--- a/test/lib/lmb.c
+++ b/test/lib/lmb.c
@@ -4,10 +4,12 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <lmb.h>
 #include <log.h>
 #include <malloc.h>
 #include <dm/test.h>
+#include <test/test.h>
 #include <test/ut.h>
 
 static int check_lmb(struct unit_test_state *uts, struct lmb *lmb,