[U-Boot] [PATCH v2 48/71] sandbox: usb: Convert emulators to livetree

Simon Glass sjg at chromium.org
Wed May 10 14:21:27 UTC 2017


Update the sandbox flash and hub USB emulators to support a live device
tree.

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

Changes in v2: None

 drivers/usb/emul/sandbox_flash.c | 4 +---
 drivers/usb/emul/sandbox_hub.c   | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index 9abb323745..73fa82b8e6 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -371,10 +371,8 @@ err:
 static int sandbox_flash_ofdata_to_platdata(struct udevice *dev)
 {
 	struct sandbox_flash_plat *plat = dev_get_platdata(dev);
-	const void *blob = gd->fdt_blob;
 
-	plat->pathname = fdt_getprop(blob, dev_of_offset(dev),
-				     "sandbox,filepath", NULL);
+	plat->pathname = dev_read_string(dev, "sandbox,filepath");
 
 	return 0;
 }
diff --git a/drivers/usb/emul/sandbox_hub.c b/drivers/usb/emul/sandbox_hub.c
index f0939b19f4..9ffda9cc74 100644
--- a/drivers/usb/emul/sandbox_hub.c
+++ b/drivers/usb/emul/sandbox_hub.c
@@ -277,8 +277,7 @@ static int sandbox_child_post_bind(struct udevice *dev)
 {
 	struct sandbox_hub_platdata *plat = dev_get_parent_platdata(dev);
 
-	plat->port = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg",
-				    -1);
+	plat->port = dev_read_u32_default(dev, "reg", -1);
 
 	return 0;
 }
-- 
2.13.0.rc2.291.g57267f2277-goog



More information about the U-Boot mailing list