From 455f2d15bfcf42a002d7d3a38c9c6b2dfe9f518c Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Mon, 20 Sep 2021 17:58:33 +0200 Subject: demo: migrate uclass to livetree Use dev_ function to read the sides and colour to support a live tree. Signed-off-by: Patrick Delaunay Reviewed-by: Simon Glass --- drivers/demo/demo-uclass.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'drivers/demo') diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c index 815f8de6453..09f9a47d4de 100644 --- a/drivers/demo/demo-uclass.c +++ b/drivers/demo/demo-uclass.c @@ -10,15 +10,11 @@ #include #include #include -#include #include #include -#include #include #include -DECLARE_GLOBAL_DATA_PTR; - UCLASS_DRIVER(demo) = { .name = "demo", .id = UCLASS_DEMO, @@ -67,10 +63,9 @@ int demo_set_light(struct udevice *dev, int light) int demo_parse_dt(struct udevice *dev) { struct dm_demo_pdata *pdata = dev_get_plat(dev); - int dn = dev_of_offset(dev); - pdata->sides = fdtdec_get_int(gd->fdt_blob, dn, "sides", 0); - pdata->colour = fdt_getprop(gd->fdt_blob, dn, "colour", NULL); + pdata->sides = dev_read_s32_default(dev, "sides", 0); + pdata->colour = dev_read_string(dev, "colour"); if (!pdata->sides || !pdata->colour) { debug("%s: Invalid device tree data\n", __func__); return -EINVAL; -- cgit v1.2.3