libfdt: move headers to <linux/libfdt.h> and <linux/libfdt_env.h>

[u-boot] / drivers / core / regmap.c

diff --git a/drivers/core/regmap.c b/drivers/core/regmap.c
index 749d913372110c1ebb2b1cbe7c8eb63e093b860d..8a0e00ff9aa60c0a87db8cb2b66080ea25908b0f 100644 (file)
--- a/drivers/core/regmap.c
+++ b/drivers/core/regmap.c
@@ -8,7 +8,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <regmap.h>
@@ -40,7 +40,7 @@ static struct regmap *regmap_alloc_count(int count)
 }
 
 #if CONFIG_IS_ENABLED(OF_PLATDATA)
-int regmap_init_mem_platdata(struct udevice *dev, u32 *reg, int count,
+int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count,
                             struct regmap **mapp)
 {
        struct regmap_range *range;
@@ -72,8 +72,8 @@ int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
        ofnode node = dev_ofnode(dev);
        struct resource r;
 
-       addr_len = dev_read_addr_cells(dev->parent);
-       size_len = dev_read_size_cells(dev->parent);
+       addr_len = dev_read_simple_addr_cells(dev->parent);
+       size_len = dev_read_simple_size_cells(dev->parent);
        both_len = addr_len + size_len;
 
        len = dev_read_size(dev, "reg");