Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

dm: clk: Remove simple version of clk_get_by_index/name()

Browse source 
Simple version of clk_get_by_index() added by:
"dm: clk: Add a simple version of clk_get_by_index()"
(sha1: a4b10c088c)
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@xilinx.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Michal Simek 2016-07-14 13:11:37 +02:00
parent 23ffd36a52
commit 9e0758b7ff
1 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/clk/clk-uclass.c
View file

@ -21,7 +21,6 @@ static inline struct clk_ops *clk_dev_ops(struct udevice *dev)
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) #if CONFIG_IS_ENABLED(OF_CONTROL)
#ifdef CONFIG_SPL_BUILD
# if CONFIG_IS_ENABLED(OF_PLATDATA) # if CONFIG_IS_ENABLED(OF_PLATDATA)
int clk_get_by_index_platdata(struct udevice *dev, int index, int clk_get_by_index_platdata(struct udevice *dev, int index,
struct phandle_2_cell *cells, struct clk *clk) 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; return 0;
} }
# else # 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, static int clk_of_xlate_default(struct clk *clk,
struct fdtdec_phandle_args *args) 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); return clk_request(dev_clk, clk);
} }
# endif /* OF_PLATDATA */
int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk) 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); return clk_get_by_index(dev, index, clk);
} }
#endif /* CONFIG_SPL_BUILD */
#endif /* OF_CONTROL */ #endif /* OF_CONTROL */
int clk_request(struct udevice *dev, struct clk *clk) int clk_request(struct udevice *dev, struct clk *clk)