clk: Modify xlate() method for livetree

Update the xlate() method to use ofnode_phandle_args instead of the fdtdec variant. This will allow drivers to support a live device tree. Signed-off-by: Simon Glass <sjg@chromium.org>

clk: Modify xlate() method for livetree
Update the xlate() method to use ofnode_phandle_args instead of the fdtdec variant. This will allow drivers to support a live device tree. Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass
1 parent a1e4adee99
Showing 5 changed files with 10 additions and 9 deletions Side-by-side Diff
drivers/clk/at91/pmc.c
drivers/clk/at91/pmc.h
drivers/clk/clk-uclass.c
drivers/clk/clk_stm32f7.c
include/clk-uclass.h
@@ -87,7 +87,7 @@
 	return 0;
 }
  
-int at91_clk_of_xlate(struct clk *clk, struct fdtdec_phandle_args *args)
+int at91_clk_of_xlate(struct clk *clk, struct ofnode_phandle_args *args)
 {
 	int periph;
  
@@ -15,7 +15,7 @@
 int at91_pmc_core_probe(struct udevice *dev);
 int at91_clk_sub_device_bind(struct udevice *dev, const char *drv_name);
  
-int at91_clk_of_xlate(struct clk *clk, struct fdtdec_phandle_args *args);
+int at91_clk_of_xlate(struct clk *clk, struct ofnode_phandle_args *args);
 int at91_clk_probe(struct udevice *dev);
  
 #endif
@@ -38,7 +38,7 @@
 }
 # else
 static int clk_of_xlate_default(struct clk *clk,
-				struct fdtdec_phandle_args *args)
+				struct ofnode_phandle_args *args)
 {
 	debug("%s(clk=%p)\n", __func__, clk);
  
  
@@ -86,9 +86,10 @@
 	ops = clk_dev_ops(dev_clk);
  
 	if (ops->of_xlate)
-		ret = ops->of_xlate(clk, &args);
+		ret = ops->of_xlate(clk, (struct ofnode_phandle_args *)&args);
 	else
-		ret = clk_of_xlate_default(clk, &args);
+		ret = clk_of_xlate_default(clk,
+					   (struct ofnode_phandle_args *)&args);
 	if (ret) {
 		debug("of_xlate() failed: %d\n", ret);
 		return ret;
@@ -252,8 +252,7 @@
 	return 0;
 }
  
-static int stm32_clk_of_xlate(struct clk *clk,
-			struct fdtdec_phandle_args *args)
+static int stm32_clk_of_xlate(struct clk *clk, struct ofnode_phandle_args *args)
 {
 	debug("%s(clk=%p)\n", __func__, clk);
  
@@ -12,8 +12,9 @@
 /* See clk.h for background documentation. */
  
 #include <clk.h>
-#include <fdtdec.h>
  
+struct ofnode_phandle_args;
+
 /**
  * struct clk_ops - The functions that a clock driver must implement.
  */
@@ -37,7 +38,7 @@
 	 * @return 0 if OK, or a negative error code.
 	 */
 	int (*of_xlate)(struct clk *clock,
-			struct fdtdec_phandle_args *args);
+			struct ofnode_phandle_args *args);
 	/**
 	 * request - Request a translated clock.
 	 *
...	...	@@ -87,7 +87,7 @@
87	87	return 0;
88	88	}
89	89
90		-int at91_clk_of_xlate(struct clk clk, struct fdtdec_phandle_args args)
	90	+int at91_clk_of_xlate(struct clk clk, struct ofnode_phandle_args args)
91	91	{
92	92	int periph;
93	93
...	...	@@ -15,7 +15,7 @@
15	15	int at91_pmc_core_probe(struct udevice *dev);
16	16	int at91_clk_sub_device_bind(struct udevice dev, const char drv_name);
17	17
18		-int at91_clk_of_xlate(struct clk clk, struct fdtdec_phandle_args args);
	18	+int at91_clk_of_xlate(struct clk clk, struct ofnode_phandle_args args);
19	19	int at91_clk_probe(struct udevice *dev);
20	20
21	21	#endif
...	...	@@ -38,7 +38,7 @@
38	38	}
39	39	# else
40	40	static int clk_of_xlate_default(struct clk *clk,
41		- struct fdtdec_phandle_args *args)
	41	+ struct ofnode_phandle_args *args)
42	42	{
43	43	debug("%s(clk=%p)\n", __func__, clk);
44	44
45	45
...	...	@@ -86,9 +86,10 @@
86	86	ops = clk_dev_ops(dev_clk);
87	87
88	88	if (ops->of_xlate)
89		- ret = ops->of_xlate(clk, &args);
	89	+ ret = ops->of_xlate(clk, (struct ofnode_phandle_args *)&args);
90	90	else
91		- ret = clk_of_xlate_default(clk, &args);
	91	+ ret = clk_of_xlate_default(clk,
	92	+ (struct ofnode_phandle_args *)&args);
92	93	if (ret) {
93	94	debug("of_xlate() failed: %d\n", ret);
94	95	return ret;
...	...	@@ -252,8 +252,7 @@
252	252	return 0;
253	253	}
254	254
255		-static int stm32_clk_of_xlate(struct clk *clk,
256		- struct fdtdec_phandle_args *args)
	255	+static int stm32_clk_of_xlate(struct clk clk, struct ofnode_phandle_args args)
257	256	{
258	257	debug("%s(clk=%p)\n", __func__, clk);
259	258
...	...	@@ -12,8 +12,9 @@
12	12	/* See clk.h for background documentation. */
13	13
14	14	#include <clk.h>
15		-#include <fdtdec.h>
16	15
	16	+struct ofnode_phandle_args;
	17	+
17	18	/**
18	19	* struct clk_ops - The functions that a clock driver must implement.
19	20	*/
...	...	@@ -37,7 +38,7 @@
37	38	* @return 0 if OK, or a negative error code.
38	39	*/
39	40	int (of_xlate)(struct clk clock,
40		- struct fdtdec_phandle_args *args);
	41	+ struct ofnode_phandle_args *args);
41	42	/**
42	43	* request - Request a translated clock.
43	44	*