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

clk: fix compilation errors for poplar platform

Browse source 
Move clk_release_all() prototype and definition inside
OF_CONTROL flag to avoid following compilation error for
poplar platform:

aarch64:  +   poplar
+drivers/usb/host/built-in.o: In function `ehci_usb_remove':
+drivers/usb/host/ehci-generic.c:159: undefined reference to `clk_release_all'
+drivers/usb/host/built-in.o: In function `ehci_usb_probe':
+drivers/usb/host/ehci-generic.c:133: undefined reference to `clk_release_all'
+make[1]: *** [u-boot] Error 139
+make: *** [sub-make] Error 2

Introduced by 4e542c4 clk: add clk_release_all()

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrice Chotard 2017-07-25 13:24:45 +02:00 committed by Marek Vasut
parent d38a8ea19c
commit b108d8a0de
2 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,30 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk)
return clk_get_by_index(dev, index, clk);
}
int clk_release_all(struct clk *clk, int count)
{
int i, ret;
for (i = 0; i < count; i++) {
debug("%s(clk[%d]=%p)\n", __func__, i, &clk[i]);
/* check if clock has been previously requested */
if (!clk[i].dev)
continue;
ret = clk_disable(&clk[i]);
if (ret && ret != -ENOSYS)
return ret;
ret = clk_free(&clk[i]);
if (ret && ret != -ENOSYS)
return ret;
}
return 0;
}
#endif /* OF_CONTROL */
int clk_request(struct udevice *dev, struct clk *clk)
@ -190,29 +214,6 @@ int clk_disable(struct clk *clk)
return ops->disable(clk);
}
int clk_release_all(struct clk *clk, int count)
{
int i, ret;
for (i = 0; i < count; i++) {
debug("%s(clk[%d]=%p)\n", __func__, i, &clk[i]);
/* check if clock has been previously requested */
if (!clk[i].dev)
continue;
ret = clk_disable(&clk[i]);
if (ret && ret != -ENOSYS)
return ret;
ret = clk_free(&clk[i]);
if (ret && ret != -ENOSYS)
return ret;
}
return 0;
}
UCLASS_DRIVER(clk) = {
.id = UCLASS_CLK,
.name = "clk",

35
include/clk.h
View file

@ -98,6 +98,21 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk);
* @return 0 if OK, or a negative error code.
*/
int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk);
/**
* clk_release_all() - Disable (turn off)/Free an array of previously
* requested clocks.
*
* For each clock contained in the clock array, this function will check if
* clock has been previously requested and then will disable and free it.
*
* @clk: A clock struct array that was previously successfully
* requested by clk_request/get_by_*().
* @count Number of clock contained in the array
* @return zero on success, or -ve error code.
*/
int clk_release_all(struct clk *clk, int count);
#else
static inline int clk_get_by_index(struct udevice *dev, int index,
struct clk *clk)
@ -110,6 +125,12 @@ static inline int clk_get_by_name(struct udevice *dev, const char *name,
{
return -ENOSYS;
}
static inline int clk_release_all(struct clk *clk, int count)
{
return -ENOSYS;
}
#endif
/**
@ -174,20 +195,6 @@ int clk_enable(struct clk *clk);
*/
int clk_disable(struct clk *clk);
/**
* clk_release_all() - Disable (turn off)/Free an array of previously
* requested clocks.
*
* For each clock contained in the clock array, this function will check if
* clock has been previously requested and then will disable and free it.
*
* @clk: A clock struct array that was previously successfully
* requested by clk_request/get_by_*().
* @count Number of clock contained in the array
* @return zero on success, or -ve error code.
*/
int clk_release_all(struct clk *clk, int count);
int soc_clk_dump(void);
#endif