From: Simon Glass <sjg@chromium.org>
Date: Fri, 19 May 2017 02:09:46 +0000 (-0600)
Subject: dm: mailbox: Update uclass to support livetree
X-Git-Tag: v2017.07-rc1~112
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5e1ff6480fbe7cf1b2be1f8a13086b217b2f8578;p=u-boot

dm: mailbox: Update uclass to support livetree

Update the mailbox uclass to support livetree. Fix the xlate() method
in all callers.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/mailbox/mailbox-uclass.c b/drivers/mailbox/mailbox-uclass.c
index 38448de965..822ae5b45e 100644
--- a/drivers/mailbox/mailbox-uclass.c
+++ b/drivers/mailbox/mailbox-uclass.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <dm.h>
-#include <fdtdec.h>
 #include <mailbox.h>
 #include <mailbox-uclass.h>
 
@@ -18,7 +17,7 @@ static inline struct mbox_ops *mbox_dev_ops(struct udevice *dev)
 }
 
 static int mbox_of_xlate_default(struct mbox_chan *chan,
-				 struct fdtdec_phandle_args *args)
+				 struct ofnode_phandle_args *args)
 {
 	debug("%s(chan=%p)\n", __func__, chan);
 
@@ -34,24 +33,22 @@ static int mbox_of_xlate_default(struct mbox_chan *chan,
 
 int mbox_get_by_index(struct udevice *dev, int index, struct mbox_chan *chan)
 {
-	struct fdtdec_phandle_args args;
+	struct ofnode_phandle_args args;
 	int ret;
 	struct udevice *dev_mbox;
 	struct mbox_ops *ops;
 
 	debug("%s(dev=%p, index=%d, chan=%p)\n", __func__, dev, index, chan);
 
-	ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev),
-					     "mboxes", "#mbox-cells", 0,
-					     index, &args);
+	ret = dev_read_phandle_with_args(dev, "mboxes", "#mbox-cells", 0, index,
+					 &args);
 	if (ret) {
-		debug("%s: fdtdec_parse_phandle_with_args failed: %d\n",
-		      __func__, ret);
+		debug("%s: dev_read_phandle_with_args failed: %d\n", __func__,
+		      ret);
 		return ret;
 	}
 
-	ret = uclass_get_device_by_of_offset(UCLASS_MAILBOX, args.node,
-					     &dev_mbox);
+	ret = uclass_get_device_by_ofnode(UCLASS_MAILBOX, args.node, &dev_mbox);
 	if (ret) {
 		debug("%s: uclass_get_device_by_of_offset failed: %d\n",
 		      __func__, ret);
@@ -85,8 +82,7 @@ int mbox_get_by_name(struct udevice *dev, const char *name,
 
 	debug("%s(dev=%p, name=%s, chan=%p)\n", __func__, dev, name, chan);
 
-	index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev),
-				      "mbox-names", name);
+	index = dev_read_stringlist_search(dev, "mbox-names", name);
 	if (index < 0) {
 		debug("fdt_stringlist_search() failed: %d\n", index);
 		return index;
diff --git a/drivers/mailbox/tegra-hsp.c b/drivers/mailbox/tegra-hsp.c
index b546ba2471..bd2ec411c7 100644
--- a/drivers/mailbox/tegra-hsp.c
+++ b/drivers/mailbox/tegra-hsp.c
@@ -72,7 +72,7 @@ static int tegra_hsp_db_id(ulong chan_id)
 }
 
 static int tegra_hsp_of_xlate(struct mbox_chan *chan,
-			      struct fdtdec_phandle_args *args)
+			      struct ofnode_phandle_args *args)
 {
 	debug("%s(chan=%p)\n", __func__, chan);
 
diff --git a/include/mailbox-uclass.h b/include/mailbox-uclass.h
index 6ec62e5a0e..8a638b04c5 100644
--- a/include/mailbox-uclass.h
+++ b/include/mailbox-uclass.h
@@ -36,7 +36,7 @@ struct mbox_ops {
 	 * @return 0 if OK, or a negative error code.
 	 */
 	int (*of_xlate)(struct mbox_chan *chan,
-			struct fdtdec_phandle_args *args);
+			struct ofnode_phandle_args *args);
 	/**
 	 * request - Request a translated channel.
 	 *