fdtdec: Reorder fdtdec_set_carveout() parameters for consistency

The fdtdec_set_carveout() function's parameters are inconsistent with
the parameters passed to fdtdec_add_reserved_memory(). Fix up the order
to make it more consistent.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c
index 5807725..bc0a133 100644 (file)
--- a/board/nvidia/p2371-2180/p2371-2180.c
+++ b/board/nvidia/p2371-2180/p2371-2180.c
@@ -138,8 +138,8 @@ static int ft_copy_carveout(void *dst, const void *src, const char *node)
                return err;
        }
 
-       err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer",
-                                 NULL, 0, &fb);
+       err = fdtdec_set_carveout(dst, node, "memory-region", 0, &fb,
+                                 "framebuffer", NULL, 0);
        if (err < 0) {
                printf("failed to set carveout for %s: %d\n", node, err);
                return err;

diff --git a/board/nvidia/p2771-0000/p2771-0000.c b/board/nvidia/p2771-0000/p2771-0000.c
index e35e6b6..cde5eff 100644 (file)
--- a/board/nvidia/p2771-0000/p2771-0000.c
+++ b/board/nvidia/p2771-0000/p2771-0000.c
@@ -114,8 +114,8 @@ static int ft_copy_carveout(void *dst, const void *src, const char *node)
                return err;
        }
 
-       err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer",
-                                 NULL, 0, &fb);
+       err = fdtdec_set_carveout(dst, node, "memory-region", 0, &fb,
+                                 "framebuffer", NULL, 0);
        if (err < 0) {
                printf("failed to set carveout for %s: %d\n", node, err);
                return err;

diff --git a/board/nvidia/p3450-0000/p3450-0000.c b/board/nvidia/p3450-0000/p3450-0000.c
index f169164..e737fc1 100644 (file)
--- a/board/nvidia/p3450-0000/p3450-0000.c
+++ b/board/nvidia/p3450-0000/p3450-0000.c
@@ -137,8 +137,8 @@ static int ft_copy_carveout(void *dst, const void *src, const char *node)
                return err;
        }
 
-       err = fdtdec_set_carveout(dst, node, "memory-region", 0, "framebuffer",
-                                 NULL, 0, &fb);
+       err = fdtdec_set_carveout(dst, node, "memory-region", 0, &fb,
+                                 "framebuffer", NULL, 0);
        if (err < 0) {
                printf("failed to set carveout for %s: %d\n", node, err);
                return err;

diff --git a/include/fdtdec.h b/include/fdtdec.h
index 5a6a7cb..d360d7b 100644 (file)
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -1110,16 +1110,16 @@ int fdtdec_get_carveout(const void *blob, const char *node,
  * @param prop_name    name of the property in which to store the phandle of
  *                     the carveout
  * @param index                index of the phandle to store
- * @param name         base name of the reserved-memory node to create
  * @param carveout     information about the carveout to add
+ * @param name         base name of the reserved-memory node to create
  * @param compatibles  compatible strings to set for the carveout
  * @param count                number of compatible strings
  * @return 0 on success or a negative error code on failure
  */
 int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name,
-                       unsigned int index, const char *name,
-                       const char **compatibles, unsigned int count,
-                       const struct fdt_memory *carveout);
+                       unsigned int index, const struct fdt_memory *carveout,
+                       const char *name, const char **compatibles,
+                       unsigned int count);
 
 /**
  * Set up the device tree ready for use

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index f124f05..a0ecc72 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -1523,9 +1523,9 @@ skip_compat:
 }
 
 int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name,
-                       unsigned int index, const char *name,
-                       const char **compatibles, unsigned int count,
-                       const struct fdt_memory *carveout)
+                       unsigned int index, const struct fdt_memory *carveout,
+                       const char *name, const char **compatibles,
+                       unsigned int count)
 {
        uint32_t phandle;
        int err, offset, len;

diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 72c3001..3af9fb5 100644 (file)
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -189,8 +189,8 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns)
        offset = CHECK(fdt_add_subnode(fdt, 0, name + 1));
        CHECK(fdt_setprop(fdt, offset, "reg", cells, (na + ns) * sizeof(*cells)));
 
-       return fdtdec_set_carveout(fdt, name, "memory-region", 0,
-                                  "framebuffer", NULL, 0, &carveout);
+       return fdtdec_set_carveout(fdt, name, "memory-region", 0, &carveout,
+                                  "framebuffer", NULL, 0);
 }
 
 static int check_fdt_carveout(void *fdt, uint32_t address_cells,

diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c
index 7b543e7..385aa77 100644 (file)
--- a/test/dm/fdtdec.c
+++ b/test/dm/fdtdec.c
@@ -28,21 +28,18 @@ static int dm_test_fdtdec_set_carveout(struct unit_test_state *uts)
 
        resv.start = 0x1000;
        resv.end = 0x2000;
-       ut_assertok(fdtdec_set_carveout(blob, "/a-test",
-                                       "memory-region", 2, "test_resv1",
-                                       NULL, 0, &resv));
+       ut_assertok(fdtdec_set_carveout(blob, "/a-test", "memory-region", 2,
+                                       &resv, "test_resv1", NULL, 0));
 
        resv.start = 0x10000;
        resv.end = 0x20000;
-       ut_assertok(fdtdec_set_carveout(blob, "/a-test",
-                                       "memory-region", 1, "test_resv2",
-                                       NULL, 0, &resv));
+       ut_assertok(fdtdec_set_carveout(blob, "/a-test", "memory-region", 1,
+                                       &resv, "test_resv2", NULL, 0));
 
        resv.start = 0x100000;
        resv.end = 0x200000;
-       ut_assertok(fdtdec_set_carveout(blob, "/a-test",
-                                       "memory-region", 0, "test_resv3",
-                                       NULL, 0, &resv));
+       ut_assertok(fdtdec_set_carveout(blob, "/a-test", "memory-region", 0,
+                                       &resv, "test_resv3", NULL, 0));
 
        offset = fdt_path_offset(blob, "/a-test");
        ut_assert(offset > 0);