Merge branch 'omap-gpmc-fixes-for-v3.10' of git://github.com/jonhunter/linux into fixes

3 files changed, 54 insertions, 68 deletions

diff --git a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
index e7f8d7ed47eb..6a983c1d87cd 100644
--- a/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
@@ -56,20 +56,20 @@ Example for an AM33xx board:
                         nand-bus-width = <16>;
                         ti,nand-ecc-opt = "bch8";
 
-                        gpmc,sync-clk = <0>;
-                        gpmc,cs-on = <0>;
-                        gpmc,cs-rd-off = <44>;
-                        gpmc,cs-wr-off = <44>;
-                        gpmc,adv-on = <6>;
-                        gpmc,adv-rd-off = <34>;
-                        gpmc,adv-wr-off = <44>;
-                        gpmc,we-off = <40>;
-                        gpmc,oe-off = <54>;
-                        gpmc,access = <64>;
-                        gpmc,rd-cycle = <82>;
-                        gpmc,wr-cycle = <82>;
-                        gpmc,wr-access = <40>;
-                        gpmc,wr-data-mux-bus = <0>;
+                        gpmc,sync-clk-ps = <0>;
+                        gpmc,cs-on-ns = <0>;
+                        gpmc,cs-rd-off-ns = <44>;
+                        gpmc,cs-wr-off-ns = <44>;
+                        gpmc,adv-on-ns = <6>;
+                        gpmc,adv-rd-off-ns = <34>;
+                        gpmc,adv-wr-off-ns = <44>;
+                        gpmc,we-off-ns = <40>;
+                        gpmc,oe-off-ns = <54>;
+                        gpmc,access-ns = <64>;
+                        gpmc,rd-cycle-ns = <82>;
+                        gpmc,wr-cycle-ns = <82>;
+                        gpmc,wr-access-ns = <40>;
+                        gpmc,wr-data-mux-bus-ns = <0>;
 
                         #address-cells = <1>;
                         #size-cells = <1>;
diff --git a/Documentation/devicetree/bindings/net/gpmc-eth.txt b/Documentation/devicetree/bindings/net/gpmc-eth.txt
index 24cb4e46f675..ace4a64b3695 100644
--- a/Documentation/devicetree/bindings/net/gpmc-eth.txt
+++ b/Documentation/devicetree/bindings/net/gpmc-eth.txt
@@ -26,16 +26,16 @@ Required properties:
 - bank-width:           Address width of the device in bytes. GPMC supports 8-bit
                         and 16-bit devices and so must be either 1 or 2 bytes.
 - compatible:           Compatible string property for the ethernet child device.
-- gpmc,cs-on:           Chip-select assertion time
-- gpmc,cs-rd-off:       Chip-select de-assertion time for reads
-- gpmc,cs-wr-off:       Chip-select de-assertion time for writes
-- gpmc,oe-on:           Output-enable assertion time
-- gpmc,oe-off           Output-enable de-assertion time
-- gpmc,we-on:           Write-enable assertion time
-- gpmc,we-off:          Write-enable de-assertion time
-- gpmc,access:          Start cycle to first data capture (read access)
-- gpmc,rd-cycle:        Total read cycle time
-- gpmc,wr-cycle:        Total write cycle time
+- gpmc,cs-on-ns:        Chip-select assertion time
+- gpmc,cs-rd-off-ns:    Chip-select de-assertion time for reads
+- gpmc,cs-wr-off-ns:    Chip-select de-assertion time for writes
+- gpmc,oe-on-ns:        Output-enable assertion time
+- gpmc,oe-off-ns:       Output-enable de-assertion time
+- gpmc,we-on-ns:        Write-enable assertion time
+- gpmc,we-off-ns:       Write-enable de-assertion time
+- gpmc,access-ns:       Start cycle to first data capture (read access)
+- gpmc,rd-cycle-ns:     Total read cycle time
+- gpmc,wr-cycle-ns:     Total write cycle time
 - reg:                  Chip-select, base address (relative to chip-select)
                         and size of the memory mapped for the device.
                         Note that base address will be typically 0 as this
@@ -65,24 +65,24 @@ gpmc: gpmc@6e000000 {
                 bank-width = <2>;
 
                 gpmc,mux-add-data;
-                gpmc,cs-on = <0>;
-                gpmc,cs-rd-off = <186>;
-                gpmc,cs-wr-off = <186>;
-                gpmc,adv-on = <12>;
-                gpmc,adv-rd-off = <48>;
-                gpmc,adv-wr-off = <48>;
-                gpmc,oe-on = <54>;
-                gpmc,oe-off = <168>;
-                gpmc,we-on = <54>;
-                gpmc,we-off = <168>;
-                gpmc,rd-cycle = <186>;
-                gpmc,wr-cycle = <186>;
-                gpmc,access = <114>;
-                gpmc,page-burst-access = <6>;
-                gpmc,bus-turnaround = <12>;
-                gpmc,cycle2cycle-delay = <18>;
-                gpmc,wr-data-mux-bus = <90>;
-                gpmc,wr-access = <186>;
+                gpmc,cs-on-ns = <0>;
+                gpmc,cs-rd-off-ns = <186>;
+                gpmc,cs-wr-off-ns = <186>;
+                gpmc,adv-on-ns = <12>;
+                gpmc,adv-rd-off-ns = <48>;
+                gpmc,adv-wr-off-ns = <48>;
+                gpmc,oe-on-ns = <54>;
+                gpmc,oe-off-ns = <168>;
+                gpmc,we-on-ns = <54>;
+                gpmc,we-off-ns = <168>;
+                gpmc,rd-cycle-ns = <186>;
+                gpmc,wr-cycle-ns = <186>;
+                gpmc,access-ns = <114>;
+                gpmc,page-burst-access-ns = <6>;
+                gpmc,bus-turnaround-ns = <12>;
+                gpmc,cycle2cycle-delay-ns = <18>;
+                gpmc,wr-data-mux-bus-ns = <90>;
+                gpmc,wr-access-ns = <186>;
                 gpmc,cycle2cycle-samecsen;
                 gpmc,cycle2cycle-diffcsen;
 
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index ed946df5ad8a..6c4da1254f53 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -1520,36 +1520,22 @@ static int gpmc_probe_dt(struct platform_device *pdev)
                 return ret;
         }
 
-        for_each_node_by_name(child, "nand") {
-                ret = gpmc_probe_nand_child(pdev, child);
-                if (ret < 0) {
-                        of_node_put(child);
-                        return ret;
-                }
-        }
+        for_each_child_of_node(pdev->dev.of_node, child) {
 
-        for_each_node_by_name(child, "onenand") {
-                ret = gpmc_probe_onenand_child(pdev, child);
-                if (ret < 0) {
-                        of_node_put(child);
-                        return ret;
-                }
-        }
+                if (!child->name)
+                        continue;
 
-        for_each_node_by_name(child, "nor") {
-                ret = gpmc_probe_generic_child(pdev, child);
-                if (ret < 0) {
-                        of_node_put(child);
-                        return ret;
-                }
-        }
+                if (of_node_cmp(child->name, "nand") == 0)
+                        ret = gpmc_probe_nand_child(pdev, child);
+                else if (of_node_cmp(child->name, "onenand") == 0)
+                        ret = gpmc_probe_onenand_child(pdev, child);
+                else if (of_node_cmp(child->name, "ethernet") == 0 ||
+                         of_node_cmp(child->name, "nor") == 0)
+                        ret = gpmc_probe_generic_child(pdev, child);
 
-        for_each_node_by_name(child, "ethernet") {
-                ret = gpmc_probe_generic_child(pdev, child);
-                if (ret < 0) {
+                if (WARN(ret < 0, "%s: probing gpmc child %s failed\n",
+                         __func__, child->full_name))
                         of_node_put(child);
-                        return ret;
-                }
         }
 
         return 0;