GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge git://git.denx.de/u-boot-dm

Browse source
This commit is contained in:
Tom Rini 2015-10-08 03:03:41 -04:00
commit 739c5e0833
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/sandbox/dts/sandbox.dts
View file

@ -153,6 +153,10 @@
}; };
}; };
reset@1 {
compatible = "sandbox,reset";
};
spi@0 { spi@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

8
drivers/core/device.c
View file

@ -289,8 +289,12 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
dev->flags |= DM_FLAG_ACTIVATED; dev->flags |= DM_FLAG_ACTIVATED;
/* continue regardless of the result of pinctrl */ /*
pinctrl_select_state(dev, "default"); * Process pinctrl for everything except the root device, and
* continue regardless of the result of pinctrl.
*/
if (dev->parent)
pinctrl_select_state(dev, "default");
ret = uclass_pre_probe_device(dev); ret = uclass_pre_probe_device(dev);
if (ret) if (ret)

2
drivers/misc/reset_sandbox.c
View file

@ -40,7 +40,7 @@ static int sandbox_reset_request(struct udevice *dev, enum reset_t type)
* (see the U_BOOT_DEVICE() declaration below) should not do anything. * (see the U_BOOT_DEVICE() declaration below) should not do anything.
* If we are that device, return an error. * If we are that device, return an error.
*/ */
if (gd->fdt_blob && dev->of_offset == -1) if (state->fdt_fname && dev->of_offset == -1)
return -ENODEV; return -ENODEV;
switch (type) { switch (type) {

7
test/dm/core.c
View file

@ -77,7 +77,7 @@ void dm_leak_check_start(struct unit_test_state *uts)
int dm_leak_check_end(struct unit_test_state *uts) int dm_leak_check_end(struct unit_test_state *uts)
{ {
struct mallinfo end; struct mallinfo end;
int id; int id, diff;
/* Don't delete the root class, since we started with that */ /* Don't delete the root class, since we started with that */
for (id = UCLASS_ROOT + 1; id < UCLASS_COUNT; id++) { for (id = UCLASS_ROOT + 1; id < UCLASS_COUNT; id++) {
@ -90,6 +90,11 @@ int dm_leak_check_end(struct unit_test_state *uts)
} }
end = mallinfo(); end = mallinfo();
diff = end.uordblks - uts->start.uordblks;
if (diff > 0)
printf("Leak: lost %#xd bytes\n", diff);
else if (diff < 0)
printf("Leak: gained %#xd bytes\n", -diff);
ut_asserteq(uts->start.uordblks, end.uordblks); ut_asserteq(uts->start.uordblks, end.uordblks);
return 0; return 0;