dm: Use an explicit expect value in core tests

Rather than reusing the 'reg' property, use an explicit property for the
expected ping value used in testing.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-07-23 06:54:57 -06:00
parent 5b9765c7d6
commit eb9ef5fee7
2 changed files with 12 additions and 6 deletions

View File

@ -39,7 +39,8 @@ static int testfdt_ofdata_to_platdata(struct udevice *dev)
pdata->ping_add = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
"ping-add", -1);
pdata->base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
pdata->base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset,
"ping-expect");
return 0;
}
@ -127,11 +128,13 @@ static int dm_test_fdt(struct dm_test_state *dms)
ut_assert(!ret);
/*
* Get the 'reg' property, which tells us what the ping add
* should be. We don't use the platdata because we want
* to test the code that sets that up (testfdt_drv_probe()).
* Get the 'ping-expect' property, which tells us what the
* ping add should be. We don't use the platdata because we
* want to test the code that sets that up
* (testfdt_drv_probe()).
*/
base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset,
"ping-expect");
debug("dev=%d, base=%d: %s\n", i, base,
fdt_get_name(gd->fdt_blob, dev->of_offset, NULL));

View File

@ -9,6 +9,7 @@
a-test {
reg = <0>;
compatible = "denx,u-boot-fdt-test";
ping-expect = <0>;
ping-add = <0>;
};
@ -24,13 +25,14 @@
b-test {
reg = <3>;
compatible = "denx,u-boot-fdt-test";
ping-expect = <3>;
ping-add = <3>;
};
some-bus {
#address-cells = <1>;
#size-cells = <0>;
reg = <4>;
ping-expect = <4>;
ping-add = <4>;
c-test {
compatible = "denx,u-boot-fdt-test";
@ -41,6 +43,7 @@
d-test {
reg = <6>;
ping-expect = <6>;
ping-add = <6>;
compatible = "google,another-fdt-test";
};