Merge branch 'dt-bus-name' into for-next

7 files changed, 129 insertions, 36 deletions

diff --git a/drivers/of/address.c b/drivers/of/address.c
index cb4242a69cd5..95351b2a112c 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -498,8 +498,7 @@ static u64 __of_translate_address(struct device_node *dev,
         /* Count address cells & copy address locally */
         bus->count_cells(dev, &na, &ns);
         if (!OF_CHECK_COUNTS(na, ns)) {
-                printk(KERN_ERR "prom_parse: Bad cell count for %s\n",
-                       of_node_full_name(dev));
+                pr_debug("OF: Bad cell count for %s\n", of_node_full_name(dev));
                 goto bail;
         }
         memcpy(addr, in_addr, na * 4);
@@ -564,25 +563,6 @@ u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr)
 }
 EXPORT_SYMBOL(of_translate_dma_address);
 
-bool of_can_translate_address(struct device_node *dev)
-{
-        struct device_node *parent;
-        struct of_bus *bus;
-        int na, ns;
-
-        parent = of_get_parent(dev);
-        if (parent == NULL)
-                return false;
-
-        bus = of_match_bus(parent);
-        bus->count_cells(dev, &na, &ns);
-
-        of_node_put(parent);
-
-        return OF_CHECK_COUNTS(na, ns);
-}
-EXPORT_SYMBOL(of_can_translate_address);
-
 const __be32 *of_get_address(struct device_node *dev, int index, u64 *size,
                     unsigned int *flags)
 {
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 9bcf2cf19357..5aeb89411350 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -364,7 +364,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
 
                 memset(r, 0, sizeof(*r));
                 /*
-                 * Get optional "interrupts-names" property to add a name
+                 * Get optional "interrupt-names" property to add a name
                  * to the resource.
                  */
                 of_property_read_string_index(dev, "interrupt-names", index,
@@ -380,6 +380,32 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
 EXPORT_SYMBOL_GPL(of_irq_to_resource);
 
 /**
+ * of_irq_get - Decode a node's IRQ and return it as a Linux irq number
+ * @dev: pointer to device tree node
+ * @index: zero-based index of the irq
+ *
+ * Returns Linux irq number on success, or -EPROBE_DEFER if the irq domain
+ * is not yet created.
+ *
+ */
+int of_irq_get(struct device_node *dev, int index)
+{
+        int rc;
+        struct of_phandle_args oirq;
+        struct irq_domain *domain;
+
+        rc = of_irq_parse_one(dev, index, &oirq);
+        if (rc)
+                return rc;
+
+        domain = irq_find_host(oirq.np);
+        if (!domain)
+                return -EPROBE_DEFER;
+
+        return irq_create_of_mapping(&oirq);
+}
+
+/**
  * of_irq_count - Count the number of IRQs a node uses
  * @dev: pointer to device tree node
  */
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 404d1daebefa..d0009b3614af 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -78,7 +78,6 @@ void of_device_make_bus_id(struct device *dev)
         struct device_node *node = dev->of_node;
         const __be32 *reg;
         u64 addr;
-        const __be32 *addrp;
         int magic;
 
 #ifdef CONFIG_PPC_DCR
@@ -106,15 +105,7 @@ void of_device_make_bus_id(struct device *dev)
          */
         reg = of_get_property(node, "reg", NULL);
         if (reg) {
-                if (of_can_translate_address(node)) {
-                        addr = of_translate_address(node, reg);
-                } else {
-                        addrp = of_get_address(node, 0, NULL, NULL);
-                        if (addrp)
-                                addr = of_read_number(addrp, 1);
-                        else
-                                addr = OF_BAD_ADDR;
-                }
+                addr = of_translate_address(node, reg);
                 if (addr != OF_BAD_ADDR) {
                         dev_set_name(dev, "%llx.%s",
                                      (unsigned long long)addr, node->name);
@@ -149,9 +140,8 @@ struct platform_device *of_device_alloc(struct device_node *np,
                 return NULL;
 
         /* count the io and irq resources */
-        if (of_can_translate_address(np))
-                while (of_address_to_resource(np, num_reg, &temp_res) == 0)
-                        num_reg++;
+        while (of_address_to_resource(np, num_reg, &temp_res) == 0)
+                num_reg++;
         num_irq = of_irq_count(np);
 
         /* Populate the resource table */
@@ -168,7 +158,9 @@ struct platform_device *of_device_alloc(struct device_node *np,
                         rc = of_address_to_resource(np, i, res);
                         WARN_ON(rc);
                 }
-                WARN_ON(of_irq_to_resource_table(np, res, num_irq) != num_irq);
+                if (of_irq_to_resource_table(np, res, num_irq) != num_irq)
+                        pr_debug("not all legacy IRQ resources mapped for %s\n",
+                                 np->name);
         }
 
         dev->dev.of_node = of_node_get(np);
diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c
index ae4450070503..2588faaaa305 100644
--- a/drivers/of/selftest.c
+++ b/drivers/of/selftest.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
+#include <linux/of_platform.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
@@ -427,6 +428,50 @@ static void __init of_selftest_match_node(void)
         }
 }
 
+static void __init of_selftest_platform_populate(void)
+{
+        int irq;
+        struct device_node *np, *child;
+        struct platform_device *pdev;
+        struct of_device_id match[] = {
+                { .compatible = "test-device", },
+                {}
+        };
+
+        np = of_find_node_by_path("/testcase-data");
+        of_platform_populate(np, of_default_bus_match_table, NULL, NULL);
+
+        /* Test that a missing irq domain returns -EPROBE_DEFER */
+        np = of_find_node_by_path("/testcase-data/testcase-device1");
+        pdev = of_find_device_by_node(np);
+        selftest(pdev, "device 1 creation failed\n");
+
+        irq = platform_get_irq(pdev, 0);
+        selftest(irq == -EPROBE_DEFER, "device deferred probe failed - %d\n", irq);
+
+        /* Test that a parsing failure does not return -EPROBE_DEFER */
+        np = of_find_node_by_path("/testcase-data/testcase-device2");
+        pdev = of_find_device_by_node(np);
+        selftest(pdev, "device 2 creation failed\n");
+        irq = platform_get_irq(pdev, 0);
+        selftest(irq < 0 && irq != -EPROBE_DEFER, "device parsing error failed - %d\n", irq);
+
+        np = of_find_node_by_path("/testcase-data/platform-tests");
+        if (!np) {
+                pr_err("No testcase data in device tree\n");
+                return;
+        }
+
+        for_each_child_of_node(np, child) {
+                struct device_node *grandchild;
+                of_platform_populate(child, match, NULL, NULL);
+                for_each_child_of_node(child, grandchild)
+                        selftest(of_find_device_by_node(grandchild),
+                                 "Could not create device for node '%s'\n",
+                                 grandchild->name);
+        }
+}
+
 static int __init of_selftest(void)
 {
         struct device_node *np;
@@ -445,6 +490,7 @@ static int __init of_selftest(void)
         of_selftest_parse_interrupts();
         of_selftest_parse_interrupts_extended();
         of_selftest_match_node();
+        of_selftest_platform_populate();
         pr_info("end of selftest - %i passed, %i failed\n",
                 selftest_results.passed, selftest_results.failed);
         return 0;
diff --git a/drivers/of/testcase-data/testcases.dtsi b/drivers/of/testcase-data/testcases.dtsi
index 3a5b75a8e4d7..6d8d980ac858 100644
--- a/drivers/of/testcase-data/testcases.dtsi
+++ b/drivers/of/testcase-data/testcases.dtsi
@@ -1,3 +1,4 @@
 #include "tests-phandle.dtsi"
 #include "tests-interrupts.dtsi"
 #include "tests-match.dtsi"
+#include "tests-platform.dtsi"
diff --git a/drivers/of/testcase-data/tests-interrupts.dtsi b/drivers/of/testcase-data/tests-interrupts.dtsi
index c843720bd3e5..da4695f60351 100644
--- a/drivers/of/testcase-data/tests-interrupts.dtsi
+++ b/drivers/of/testcase-data/tests-interrupts.dtsi
@@ -54,5 +54,18 @@
                                                       <&test_intmap1 1 2>;
                         };
                 };
+
+                testcase-device1 {
+                        compatible = "testcase-device";
+                        interrupt-parent = <&test_intc0>;
+                        interrupts = <1>;
+                };
+
+                testcase-device2 {
+                        compatible = "testcase-device";
+                        interrupt-parent = <&test_intc2>;
+                        interrupts = <1>; /* invalid specifier - too short */
+                };
         };
+
 };
diff --git a/drivers/of/testcase-data/tests-platform.dtsi b/drivers/of/testcase-data/tests-platform.dtsi
new file mode 100644
index 000000000000..eb20eeb2b062
--- /dev/null
+++ b/drivers/of/testcase-data/tests-platform.dtsi
@@ -0,0 +1,35 @@
+
+/ {
+        testcase-data {
+                platform-tests {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        test-device@0 {
+                                compatible = "test-device";
+                                reg = <0x0>;
+
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                dev@100 {
+                                        compatible = "test-sub-device";
+                                        reg = <0x100>;
+                                };
+                        };
+
+                        test-device@1 {
+                                compatible = "test-device";
+                                reg = <0x1>;
+
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                dev@100 {
+                                        compatible = "test-sub-device";
+                                        reg = <0x100>;
+                                };
+                        };
+                };
+        };
+};