Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

Pull device tree core updates from Grant Likely:
 "Generally minor changes.  A bunch of bug fixes, particularly for
  initialization and some refactoring.  Most notable change if feeding
  the entire flattened tree into the random pool at boot.  May not be
  significant, but shouldn't hurt either"

Tim Bird questions whether the boot time cost of the random feeding may
be noticeable.  And "add_device_randomness()" is definitely not some
speed deamon of a function.

* tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
  of/platform: add error reporting to of_amba_device_create()
  irq/of: Fix comment typo for irq_of_parse_and_map
  of: Feed entire flattened device tree into the random pool
  of/fdt: Clean up casting in unflattening path
  of/fdt: Remove duplicate memory clearing on FDT unflattening
  gpio: implement gpio-ranges binding document fix
  of: call __of_parse_phandle_with_args from of_parse_phandle
  of: introduce of_parse_phandle_with_fixed_args
  of: move of_parse_phandle()
  of: move documentation of of_parse_phandle_with_args
  of: Fix missing memory initialization on FDT unflattening
  of: consolidate definition of early_init_dt_alloc_memory_arch()
  of: Make of_get_phy_mode() return int i.s.o. const int
  include: dt-binding: input: create a DT header defining key codes.
  of/platform: Staticize of_platform_device_create_pdata()
  of: Specify initrd location using 64-bit
  dt: Typo fix
  OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled

1 files changed, 17 insertions, 4 deletions

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index eeca8a596973..9b439ac63d8e 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -197,7 +197,7 @@ EXPORT_SYMBOL(of_device_alloc);
  * Returns pointer to created platform device, or NULL if a device was not
  * registered.  Unavailable devices will not get registered.
  */
-struct platform_device *of_platform_device_create_pdata(
+static struct platform_device *of_platform_device_create_pdata(
                                         struct device_node *np,
                                         const char *bus_id,
                                         void *platform_data,
@@ -268,8 +268,11 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
                 return NULL;
 
         dev = amba_device_alloc(NULL, 0, 0);
-        if (!dev)
+        if (!dev) {
+                pr_err("%s(): amba_device_alloc() failed for %s\n",
+                       __func__, node->full_name);
                 return NULL;
+        }
 
         /* setup generic device info */
         dev->dev.coherent_dma_mask = ~0;
@@ -294,12 +297,18 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
                 dev->irq[i] = irq_of_parse_and_map(node, i);
 
         ret = of_address_to_resource(node, 0, &dev->res);
-        if (ret)
+        if (ret) {
+                pr_err("%s(): of_address_to_resource() failed (%d) for %s\n",
+                       __func__, ret, node->full_name);
                 goto err_free;
+        }
 
         ret = amba_device_add(dev, &iomem_resource);
-        if (ret)
+        if (ret) {
+                pr_err("%s(): amba_device_add() failed (%d) for %s\n",
+                       __func__, ret, node->full_name);
                 goto err_free;
+        }
 
         return dev;
 
@@ -378,6 +387,10 @@ static int of_platform_bus_create(struct device_node *bus,
         }
 
         if (of_device_is_compatible(bus, "arm,primecell")) {
+                /*
+                 * Don't return an error here to keep compatibility with older
+                 * device tree files.
+                 */
                 of_amba_device_create(bus, bus_id, platform_data, parent);
                 return 0;
         }