[U-Boot] [PATCH v3] dm: clk: Remove simple version of clk_get_by_index/name()
Michal Simek
michal.simek at xilinx.com
Tue Jul 19 08:21:40 CEST 2016
Simple version of clk_get_by_index() added by:
"dm: clk: Add a simple version of clk_get_by_index()"
(sha1: a4b10c088c4f6ef2e2bba33e8cfea369bcbbce44)
is only working for #clock-cells=<1> but not for
any other values. Fixed clocks is using #clock-cells=<0>
which requires full implementation.
Remove simplified versions of clk_get_by_index() and use full version.
Also remove empty clk_get_by_name() which is failing when it is called
which is useless.
Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---
Changes in v3:
- Rebase on the top of
"dm: clk: Add support for of-platdata"
(sha1: 7423daa60eb30b6613dfc19a51c55de23fd4d703)
Keep of-platdata part in the tree.
Changes in v2:
- Also use full version of clk_get_by_name()
- Subject change from "Remove simple version of clk_get_by_index()"
---
drivers/clk/clk-uclass.c | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index e0f85677e346..4d78e3fcac43 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -21,7 +21,6 @@ static inline struct clk_ops *clk_dev_ops(struct udevice *dev)
}
#if CONFIG_IS_ENABLED(OF_CONTROL)
-#ifdef CONFIG_SPL_BUILD
# if CONFIG_IS_ENABLED(OF_PLATDATA)
int clk_get_by_index_platdata(struct udevice *dev, int index,
struct phandle_2_cell *cells, struct clk *clk)
@@ -38,31 +37,6 @@ int clk_get_by_index_platdata(struct udevice *dev, int index,
return 0;
}
# else
-int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)
-{
- int ret;
- u32 cell[2];
-
- if (index != 0)
- return -ENOSYS;
- assert(clk);
- ret = uclass_get_device(UCLASS_CLK, 0, &clk->dev);
- if (ret)
- return ret;
- ret = fdtdec_get_int_array(gd->fdt_blob, dev->of_offset, "clocks",
- cell, 2);
- if (ret)
- return ret;
- clk->id = cell[1];
- return 0;
-}
-# endif /* OF_PLATDATA */
-
-int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
-{
- return -ENOSYS;
-}
-#else
static int clk_of_xlate_default(struct clk *clk,
struct fdtdec_phandle_args *args)
{
@@ -119,6 +93,7 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk)
return clk_request(dev_clk, clk);
}
+# endif /* OF_PLATDATA */
int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
{
@@ -135,7 +110,6 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
return clk_get_by_index(dev, index, clk);
}
-#endif /* CONFIG_SPL_BUILD */
#endif /* OF_CONTROL */
int clk_request(struct udevice *dev, struct clk *clk)
--
1.9.1
More information about the U-Boot
mailing list