fdt: Remove fdtdec_decode_region() function

This function is not used in U-Boot now. Remove it along with its 'memory'
version.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/fdtdec.h b/include/fdtdec.h
index 83be064..c26df50 100644 (file)
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -803,23 +803,6 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node,
                             const char *prop_name, int count);
 
 /**
- * Look up a property in a node which contains a memory region address and
- * size. Then return a pointer to this address.
- *
- * The property must hold one address with a length. This is only tested on
- * 32-bit machines.
- *
- * @param blob         FDT blob
- * @param node         node to examine
- * @param prop_name    name of property to find
- * @param basep                Returns base address of region
- * @param size         Returns size of region
- * @return 0 if ok, -1 on error (property not found)
- */
-int fdtdec_decode_region(const void *blob, int node, const char *prop_name,
-                        fdt_addr_t *basep, fdt_size_t *sizep);
-
-/**
  * Obtain an indexed resource from a device property.
  *
  * @param fdt          FDT blob
@@ -849,34 +832,6 @@ int fdt_get_named_resource(const void *fdt, int node, const char *property,
                           const char *prop_names, const char *name,
                           struct fdt_resource *res);
 
-/**
- * Decode a named region within a memory bank of a given type.
- *
- * This function handles selection of a memory region. The region is
- * specified as an offset/size within a particular type of memory.
- *
- * The properties used are:
- *
- *     <mem_type>-memory<suffix> for the name of the memory bank
- *     <mem_type>-offset<suffix> for the offset in that bank
- *
- * The property value must have an offset and a size. The function checks
- * that the region is entirely within the memory bank.5
- *
- * @param blob         FDT blob
- * @param node         Node containing the properties (-1 for /config)
- * @param mem_type     Type of memory to use, which is a name, such as
- *                     "u-boot" or "kernel".
- * @param suffix       String to append to the memory/offset
- *                     property names
- * @param basep                Returns base of region
- * @param sizep                Returns size of region
- * @return 0 if OK, -ive on error
- */
-int fdtdec_decode_memory_region(const void *blob, int node,
-                               const char *mem_type, const char *suffix,
-                               fdt_addr_t *basep, fdt_size_t *sizep);
-
 /* Display timings from linux include/video/display_timing.h */
 enum display_flags {
        DISPLAY_FLAGS_HSYNC_LOW         = 1 << 0,

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index 74196ce..b1b3925 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -922,28 +922,6 @@ char *fdtdec_get_config_string(const void *blob, const char *prop_name)
        return (char *)nodep;
 }
 
-int fdtdec_decode_region(const void *blob, int node, const char *prop_name,
-                        fdt_addr_t *basep, fdt_size_t *sizep)
-{
-       const fdt_addr_t *cell;
-       int len;
-
-       debug("%s: %s: %s\n", __func__, fdt_get_name(blob, node, NULL),
-             prop_name);
-       cell = fdt_getprop(blob, node, prop_name, &len);
-       if (!cell || (len < sizeof(fdt_addr_t) * 2)) {
-               debug("cell=%p, len=%d\n", cell, len);
-               return -1;
-       }
-
-       *basep = fdt_addr_to_cpu(*cell);
-       *sizep = fdt_size_to_cpu(cell[1]);
-       debug("%s: base=%08lx, size=%lx\n", __func__, (ulong)*basep,
-             (ulong)*sizep);
-
-       return 0;
-}
-
 u64 fdtdec_get_number(const fdt32_t *ptr, unsigned int cells)
 {
        u64 number = 0;
@@ -1002,67 +980,6 @@ int fdt_get_named_resource(const void *fdt, int node, const char *property,
        return fdt_get_resource(fdt, node, property, index, res);
 }
 
-int fdtdec_decode_memory_region(const void *blob, int config_node,
-                               const char *mem_type, const char *suffix,
-                               fdt_addr_t *basep, fdt_size_t *sizep)
-{
-       char prop_name[50];
-       const char *mem;
-       fdt_size_t size, offset_size;
-       fdt_addr_t base, offset;
-       int node;
-
-       if (config_node == -1) {
-               config_node = fdt_path_offset(blob, "/config");
-               if (config_node < 0) {
-                       debug("%s: Cannot find /config node\n", __func__);
-                       return -ENOENT;
-               }
-       }
-       if (!suffix)
-               suffix = "";
-
-       snprintf(prop_name, sizeof(prop_name), "%s-memory%s", mem_type,
-                suffix);
-       mem = fdt_getprop(blob, config_node, prop_name, NULL);
-       if (!mem) {
-               debug("%s: No memory type for '%s', using /memory\n", __func__,
-                     prop_name);
-               mem = "/memory";
-       }
-
-       node = fdt_path_offset(blob, mem);
-       if (node < 0) {
-               debug("%s: Failed to find node '%s': %s\n", __func__, mem,
-                     fdt_strerror(node));
-               return -ENOENT;
-       }
-
-       /*
-        * Not strictly correct - the memory may have multiple banks. We just
-        * use the first
-        */
-       if (fdtdec_decode_region(blob, node, "reg", &base, &size)) {
-               debug("%s: Failed to decode memory region %s\n", __func__,
-                     mem);
-               return -EINVAL;
-       }
-
-       snprintf(prop_name, sizeof(prop_name), "%s-offset%s", mem_type,
-                suffix);
-       if (fdtdec_decode_region(blob, config_node, prop_name, &offset,
-                                &offset_size)) {
-               debug("%s: Failed to decode memory region '%s'\n", __func__,
-                     prop_name);
-               return -EINVAL;
-       }
-
-       *basep = base + offset;
-       *sizep = offset_size;
-
-       return 0;
-}
-
 static int decode_timing_property(const void *blob, int node, const char *name,
                                  struct timing_entry *result)
 {