dtoc: Rename sandbox_i2c_test and sandbox_pmic_test

These have '_test' suffixes which are not present on the drivers in the
source code. Drop the suffixes to avoid a mismatch when scanning.

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

diff --git a/tools/dtoc/test/dtoc_test_simple.dts b/tools/dtoc/test/dtoc_test_simple.dts
index 1c87b891929f8b0ed403fdd824552190e054b58d..d8ab8613ee3f9d03a8c3e83b2144a75e64f49af7 100644 (file)
--- a/tools/dtoc/test/dtoc_test_simple.dts
+++ b/tools/dtoc/test/dtoc_test_simple.dts
@@ -45,12 +45,12 @@
        };
 
        i2c@0 {
-               compatible = "sandbox,i2c-test";
+               compatible = "sandbox,i2c";
                u-boot,dm-pre-reloc;
                #address-cells = <1>;
                #size-cells = <0>;
                pmic@9 {
-                       compatible = "sandbox,pmic-test";
+                       compatible = "sandbox,pmic";
                        u-boot,dm-pre-reloc;
                        reg = <9>;
                        low-power;

diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
index 523f0a923ebc880de233c21bb6e665f06229210b..9049c2895f17816b8f4d70aebae84a38fce9d5f5 100755 (executable)
--- a/tools/dtoc/test_dtoc.py
+++ b/tools/dtoc/test_dtoc.py
@@ -207,9 +207,9 @@ class TestDtoc(unittest.TestCase):
         self.assertEqual(C_HEADER.splitlines() + [''], lines)
 
     struct_text = HEADER + '''
-struct dtd_sandbox_i2c_test {
+struct dtd_sandbox_i2c {
 };
-struct dtd_sandbox_pmic_test {
+struct dtd_sandbox_pmic {
 \tbool\t\tlow_power;
 \tfdt64_t\t\treg[2];
 };
@@ -229,22 +229,22 @@ struct dtd_sandbox_spl_test {
 
     platdata_text = C_HEADER + '''
 /* Node /i2c@0 index 0 */
-static struct dtd_sandbox_i2c_test dtv_i2c_at_0 = {
+static struct dtd_sandbox_i2c dtv_i2c_at_0 = {
 };
 U_BOOT_DRVINFO(i2c_at_0) = {
-\t.name\t\t= "sandbox_i2c_test",
+\t.name\t\t= "sandbox_i2c",
 \t.plat\t= &dtv_i2c_at_0,
 \t.plat_size\t= sizeof(dtv_i2c_at_0),
 \t.parent_idx\t= -1,
 };
 
 /* Node /i2c@0/pmic@9 index 1 */
-static struct dtd_sandbox_pmic_test dtv_pmic_at_9 = {
+static struct dtd_sandbox_pmic dtv_pmic_at_9 = {
 \t.low_power\t\t= true,
 \t.reg\t\t\t= {0x9, 0x0},
 };
 U_BOOT_DRVINFO(pmic_at_9) = {
-\t.name\t\t= "sandbox_pmic_test",
+\t.name\t\t= "sandbox_pmic",
 \t.plat\t= &dtv_pmic_at_9,
 \t.plat_size\t= sizeof(dtv_pmic_at_9),
 \t.parent_idx\t= 0,