diff options
| author | Robert ABEL <rabel@cit-ec.uni-bielefeld.de> | 2015-02-27 18:56:49 +0300 |
|---|---|---|
| committer | Roger Quadros <rogerq@ti.com> | 2015-03-06 13:22:25 +0300 |
| commit | b1dc1ca9d4673dac43b8a77a8b695ffb2918de2a (patch) | |
| tree | aa3851b5d97187f5b20dfd1a478a7e215e0d6b63 /drivers/memory | |
| parent | 5e9444d9a00f4b22ad676f2d9d4b69312871e429 (diff) | |
| download | linux-b1dc1ca9d4673dac43b8a77a8b695ffb2918de2a.tar.xz | |
ARM OMAP2+ GPMC: add bus children
This patch adds support for spawning buses as children of the GPMC.
Signed-off-by: Robert ABEL <rabel@cit-ec.uni-bielefeld.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 624dccb0f002..91b5a1b9b9c2 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -27,6 +27,7 @@ #include <linux/of_address.h> #include <linux/of_mtd.h> #include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/omap-gpmc.h> #include <linux/mtd/nand.h> #include <linux/pm_runtime.h> @@ -1812,8 +1813,21 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, gpmc_cs_enable_mem(cs); no_timings: - if (of_platform_device_create(child, NULL, &pdev->dev)) - return 0; + + /* create platform device, NULL on error or when disabled */ + if (!of_platform_device_create(child, NULL, &pdev->dev)) + goto err_child_fail; + + /* is child a common bus? */ + if (of_match_node(of_default_bus_match_table, child)) + /* create children and other common bus children */ + if (of_platform_populate(child, of_default_bus_match_table, + NULL, &pdev->dev)) + goto err_child_fail; + + return 0; + +err_child_fail: dev_err(&pdev->dev, "failed to create gpmc child %s\n", child->name); ret = -ENODEV; |