diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-24 16:11:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-24 16:11:01 -0400 |
| commit | 15fd1b7903a3090a03cfe453f661822a613a91ee (patch) | |
| tree | 65ab83a17440b38d1c5b61f447e309291eb2ff28 /arch | |
| parent | 8b7f04f14a1b790ff8dec0afc28a9e8477a6eb88 (diff) | |
| parent | 49c752c93a785b9bad9d3fbbd52a76bec003eac5 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-rockchip/rk3188-board-spl.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk3288-board-spl.c | 2 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c index 59c7e4d4db..98ca971b88 100644 --- a/arch/arm/mach-rockchip/rk3188-board-spl.c +++ b/arch/arm/mach-rockchip/rk3188-board-spl.c @@ -49,7 +49,7 @@ u32 spl_boot_device(void) debug("node=%d\n", node); goto fallback; } - ret = device_get_global_by_of_offset(node, &dev); + ret = device_get_global_by_ofnode(offset_to_ofnode(node), &dev); if (ret) { debug("device at node %s/%d not found: %d\n", bootdev, node, ret); diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index ea6a14af4f..abd62e520f 100644 --- a/arch/arm/mach-rockchip/rk3288-board-spl.c +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c @@ -51,7 +51,7 @@ u32 spl_boot_device(void) debug("node=%d\n", node); goto fallback; } - ret = device_get_global_by_of_offset(node, &dev); + ret = device_get_global_by_ofnode(offset_to_ofnode(node), &dev); if (ret) { debug("device at node %s/%d not found: %d\n", bootdev, node, ret); diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 118ff9f685..3668263331 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -61,6 +61,17 @@ reg = <2 1>; }; + bind-test { + bind-test-child1 { + compatible = "sandbox,phy"; + #phy-cells = <1>; + }; + + bind-test-child2 { + compatible = "simple-bus"; + }; + }; + b-test { reg = <3 1>; compatible = "denx,u-boot-fdt-test"; |