diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-05 17:16:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-05 17:16:23 -0400 |
| commit | 7240e1b8f94a56db88a2af688cad27e2e6545302 (patch) | |
| tree | 00e07de1f4b83cf96f183b881e80cd273dabd892 /drivers/demo/demo-uclass.c | |
| parent | 50c84208ad50a27382c64af911abba4510a8b608 (diff) | |
| parent | c3ef4550a2c439e9726205769d4381ed7e7fbc3d (diff) | |
Merge branch '2021-10-05-general-updates'
- Assorted OPTEE cleanups
- pinctrl, gpio improvements, assorted livetree migrations
- Assorted pytest improvements
Diffstat (limited to 'drivers/demo/demo-uclass.c')
| -rw-r--r-- | drivers/demo/demo-uclass.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c index 815f8de645..09f9a47d4d 100644 --- a/drivers/demo/demo-uclass.c +++ b/drivers/demo/demo-uclass.c @@ -10,15 +10,11 @@ #include <dm.h> #include <dm-demo.h> #include <errno.h> -#include <fdtdec.h> #include <log.h> #include <malloc.h> -#include <asm/global_data.h> #include <asm/io.h> #include <linux/list.h> -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; |