[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1395179766-31575-5-git-send-email-pantelis.antoniou@konsulko.com>
Date: Tue, 18 Mar 2014 23:56:03 +0200
From: Pantelis Antoniou <pantelis.antoniou@...sulko.com>
To: Grant Likely <grant.likely@...retlab.ca>
Cc: Rob Herring <robherring2@...il.com>,
Stephen Warren <swarren@...dotorg.org>,
Matt Porter <matt.porter@...aro.org>,
Koen Kooi <koen@...inion.thruhere.net>,
Alison Chaiken <Alison_Chaiken@...tor.com>,
Dinh Nguyen <dinh.linux@...il.com>,
Jan Lubbe <jluebbe@...net.de>,
Alexander Sverdlin <alexander.sverdlin@....com>,
Michael Stickel <ms@...able.de>,
Guenter Roeck <linux@...ck-us.net>,
Dirk Behme <dirk.behme@...il.com>,
Alan Tull <delicious.quinoa@...il.com>,
Sascha Hauer <s.hauer@...gutronix.de>,
Michael Bohan <mbohan@...eaurora.org>,
Ionut Nicu <ioan.nicu.ext@....com>,
Michal Simek <monstr@...str.eu>,
Matt Ranostay <mranostay@...il.com>,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Pete Popov <pete.popov@...sulko.com>,
Dan Malek <dan.malek@...sulko.com>,
Georgi Vlaev <georgi.vlaev@...sulko.com>,
Pantelis Antoniou <pantelis.antoniou@...sulko.com>
Subject: [PATCH v3 4/7] OF: platform: Add overlay bus handler
Add the bus handler registration needed for performing overlays
containing platform devices.
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@...sulko.com>
---
drivers/base/platform.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 96 insertions(+), 3 deletions(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index bc78848..e113733 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -925,6 +925,87 @@ struct bus_type platform_bus_type = {
};
EXPORT_SYMBOL_GPL(platform_bus_type);
+#ifdef CONFIG_OF_OVERLAY
+
+static int platform_handler_create(struct of_overlay_device_entry *de,
+ int revert)
+{
+ struct device_node *dn;
+ struct platform_device *pdev_parent, *pdev;
+
+ if (!de || !de->np)
+ return -ENOTSUPP;
+
+ dn = de->np;
+
+ /* verify that the parent is a bus */
+ if (!of_match_node(of_default_bus_match_table, dn->parent))
+ return -ENOTSUPP;
+
+ pdev_parent = of_find_device_by_node(dn->parent);
+ if (pdev_parent == NULL)
+ return -ENOTSUPP;
+
+ pdev = of_platform_device_create(dn, NULL, &pdev_parent->dev);
+ of_dev_put(pdev_parent);
+
+ if (pdev == NULL) {
+ pr_err("%s: failed to create platform device "
+ "for '%s'\n",
+ __func__, dn->full_name);
+ /* of_platform_device_create tosses the real error code */
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int platform_handler_remove(struct of_overlay_device_entry *de,
+ int revert)
+{
+ struct device_node *dn;
+ struct platform_device *pdev;
+
+ if (!de || !de->np)
+ return -ENOTSUPP;
+
+ dn = de->np;
+
+ pdev = of_find_device_by_node(dn);
+ if (pdev == NULL)
+ return -ENOTSUPP;
+
+ /* unregister takes one ref away */
+ platform_device_unregister(pdev);
+
+ /* and put the reference of the find */
+ of_dev_put(pdev);
+
+ return 0;
+}
+
+static const struct of_overlay_handler_ops platform_handler_ops = {
+ .create = platform_handler_create,
+ .remove = platform_handler_remove,
+};
+
+static struct of_overlay_handler platform_handler = {
+ .name = "platform",
+ .ops = &platform_handler_ops,
+};
+
+static int __init platform_bus_handler_register(void)
+{
+ return of_overlay_handler_register(&platform_handler);
+}
+
+#else
+static inline int platform_bus_handler_register(void)
+{
+ return 0;
+}
+#endif
+
int __init platform_bus_init(void)
{
int error;
@@ -933,10 +1014,22 @@ int __init platform_bus_init(void)
error = device_register(&platform_bus);
if (error)
- return error;
- error = bus_register(&platform_bus_type);
+ goto err_out;
+
+ error = bus_register(&platform_bus_type);
if (error)
- device_unregister(&platform_bus);
+ goto err_unreg_dev;
+
+ error = platform_bus_handler_register();
+ if (error)
+ goto err_unreg_bus;
+
+ return 0;
+err_unreg_bus:
+ bus_unregister(&platform_bus_type);
+err_unreg_dev:
+ device_unregister(&platform_bus);
+err_out:
return error;
}
--
1.7.12
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists