diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-29 21:03:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-29 21:03:38 -0400 |
| commit | 8ddaf943589756442bba21e5be645cd47526d82b (patch) | |
| tree | 5790a6435ce416342bc9747a55d2f23a8f141c2e /drivers/firmware/scmi/smt.c | |
| parent | f3a0d2c1af630cc09a34c2159aa2dfa12b831762 (diff) | |
| parent | 5b700cdcff61426843405ca1df4b549237e8bbc2 (diff) | |
Merge tag 'dm-pull-29apr21' of https://source.denx.de/u-boot/custodians/u-boot-dm
buildman environment fix
binman FMAP improvements
minor test improvements and fixes
minor dm improvements
Diffstat (limited to 'drivers/firmware/scmi/smt.c')
| -rw-r--r-- | drivers/firmware/scmi/smt.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/firmware/scmi/smt.c b/drivers/firmware/scmi/smt.c index f1915c0074..e60c2aebc8 100644 --- a/drivers/firmware/scmi/smt.c +++ b/drivers/firmware/scmi/smt.c @@ -30,8 +30,6 @@ int scmi_dt_get_smt_buffer(struct udevice *dev, struct scmi_smt *smt) int ret; struct ofnode_phandle_args args; struct resource resource; - fdt32_t faddr; - phys_addr_t paddr; ret = dev_read_phandle_with_args(dev, "shmem", NULL, 0, 0, &args); if (ret) @@ -41,21 +39,13 @@ int scmi_dt_get_smt_buffer(struct udevice *dev, struct scmi_smt *smt) if (ret) return ret; - /* TEMP workaround for ofnode_read_resource translation issue */ - if (of_live_active()) { - paddr = resource.start; - } else { - faddr = cpu_to_fdt32(resource.start); - paddr = ofnode_translate_address(args.node, &faddr); - } - smt->size = resource_size(&resource); if (smt->size < sizeof(struct scmi_smt_header)) { dev_err(dev, "Shared memory buffer too small\n"); return -EINVAL; } - smt->buf = devm_ioremap(dev, paddr, smt->size); + smt->buf = devm_ioremap(dev, resource.start, smt->size); if (!smt->buf) return -ENOMEM; |