LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dtoc: Handle 'reg' properties with unusual sizes 

At present dtoc assumes that all 'reg' properties have both an address and
a size. For I2C devices we do not have this. Adjust dtoc to cope.

Reported-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Simon Glass 2017-08-29 14:15:51 -06:00
parent c20ee0ed07
commit 5ec741fd84
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/dtoc/dtoc_test_simple.dts
View File

@ -9,6 +9,8 @@
/dts-v1/; /dts-v1/;
/ { / {
#address-cells = <1>;
#size-cells = <1>;
spl-test { spl-test {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
compatible = "sandbox,spl-test"; compatible = "sandbox,spl-test";
@ -45,4 +47,16 @@
compatible = "sandbox,spl-test.2"; compatible = "sandbox,spl-test.2";
}; };
i2c@0 {
compatible = "sandbox,i2c-test";
u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <0>;
pmic@9 {
compatible = "sandbox,pmic-test";
u-boot,dm-pre-reloc;
reg = <9>;
low-power;
};
};
}; };

24
tools/dtoc/test_dtoc.py
View File

@ -121,6 +121,12 @@ class TestDtoc(unittest.TestCase):
data = infile.read() data = infile.read()
self.assertEqual('''#include <stdbool.h> self.assertEqual('''#include <stdbool.h>
#include <libfdt.h> #include <libfdt.h>
struct dtd_sandbox_i2c_test {
};
struct dtd_sandbox_pmic_test {
\tbool\t\tlow_power;
\tfdt64_t\t\treg[2];
};
struct dtd_sandbox_spl_test { struct dtd_sandbox_spl_test {
\tbool\t\tboolval; \tbool\t\tboolval;
\tunsigned char\tbytearray[3]; \tunsigned char\tbytearray[3];
@ -192,6 +198,24 @@ U_BOOT_DEVICE(spl_test4) = {
\t.platdata_size\t= sizeof(dtv_spl_test4), \t.platdata_size\t= sizeof(dtv_spl_test4),
}; };
static struct dtd_sandbox_i2c_test dtv_i2c_at_0 = {
};
U_BOOT_DEVICE(i2c_at_0) = {
\t.name\t\t= "sandbox_i2c_test",
\t.platdata\t= &dtv_i2c_at_0,
\t.platdata_size\t= sizeof(dtv_i2c_at_0),
};
static struct dtd_sandbox_pmic_test dtv_pmic_at_9 = {
\t.low_power\t\t= true,
\t.reg\t\t\t= {0x9, 0x0},
};
U_BOOT_DEVICE(pmic_at_9) = {
\t.name\t\t= "sandbox_pmic_test",
\t.platdata\t= &dtv_pmic_at_9,
\t.platdata_size\t= sizeof(dtv_pmic_at_9),
};
''', data) ''', data)
def test_phandle(self): def test_phandle(self):