With 64bit systems the #size-cells and #addr-cells are different to 32bit. To align with the spec we define the number of fields by the roots size and addr cells count.
Signed-off-by: Michael Grzeschik <[email protected]> --- drivers/video/simplefb-fixup.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/video/simplefb-fixup.c b/drivers/video/simplefb-fixup.c index 65e0281a189f23c3b730c7bab56d283cc29700aa..9b39e1ef46d84eed61242119251d340b44d59a6e 100644 --- a/drivers/video/simplefb-fixup.c +++ b/drivers/video/simplefb-fixup.c @@ -91,8 +91,14 @@ static int simplefb_create_node(struct device_node *root, { struct device_node *node; phys_addr_t screen_base; - u32 cells[2]; - int ret; + __be32 cells[4]; + int addr_cells = 2, size_cells = 1, ret; + + of_property_read_u32(root, "#address-cells", &addr_cells); + of_property_read_u32(root, "#size-cells", &size_cells); + + if ((addr_cells + size_cells) > 4) + return -EINVAL; node = of_create_node(root, "/framebuffer"); if (!node) @@ -107,12 +113,11 @@ static int simplefb_create_node(struct device_node *root, return ret; screen_base = virt_to_phys(fbi->screen_base); - if (upper_32_bits(screen_base)) - return -ENOSYS; - cells[0] = cpu_to_be32(lower_32_bits(screen_base)); - cells[1] = cpu_to_be32(fbi->line_length * fbi->yres); - ret = of_set_property(node, "reg", cells, sizeof(cells[0]) * 2, 1); + of_write_number(cells, screen_base, addr_cells); + of_write_number(cells + addr_cells, fbi->screen_size, size_cells); + + ret = of_set_property(node, "reg", cells, sizeof(cells[0]) * (addr_cells + size_cells), 1); if (ret < 0) return ret; -- 2.47.3
