diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-30 18:08:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-30 18:14:33 -0400 |
| commit | 23e354f82c04a1c070ca59907abc6b042761b0e7 (patch) | |
| tree | fc73baee17217f3b8c2f116a868eaa190a1bb0a4 /include/clk-uclass.h | |
| parent | d2e5250be49fce4653689c41a5dc7e2d7e7ecf33 (diff) | |
| parent | 682e73d23555afdd733c20810d282d9cc2bc0e0f (diff) | |
Merge tag 'clk-2022.04-next' of https://source.denx.de/u-boot/custodians/u-boot-clk into next
Clock patches for u-boot/next
This is mostly cleanups/consolidations. clk_free is made to return void, and the
CCF wrappers present in almost every CCF clock are consolidated. I would
particularly like to have the latter upstream, since there are at least two
series adding support for new CCF drivers (imx8mq and imxrt1170) which can
benefit from these commits.
I had to fix up the last commit since I missed an include for at91.
CI: https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/11521
Diffstat (limited to 'include/clk-uclass.h')
| -rw-r--r-- | include/clk-uclass.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/clk-uclass.h b/include/clk-uclass.h index e44f1caf516..65ebff9ed27 100644 --- a/include/clk-uclass.h +++ b/include/clk-uclass.h @@ -32,7 +32,7 @@ struct clk_ops { int (*of_xlate)(struct clk *clock, struct ofnode_phandle_args *args); int (*request)(struct clk *clock); - int (*rfree)(struct clk *clock); + void (*rfree)(struct clk *clock); ulong (*round_rate)(struct clk *clk, ulong rate); ulong (*get_rate)(struct clk *clk); ulong (*set_rate)(struct clk *clk, ulong rate); @@ -81,11 +81,9 @@ int request(struct clk *clock); * rfree() - Free a previously requested clock. * @clock: The clock to free. * - * This is the implementation of the client clk_free() API. - * - * Return: 0 if OK, or a negative error code. + * Free any resources allocated in request(). */ -int rfree(struct clk *clock); +void rfree(struct clk *clock); /** * round_rate() - Adjust a rate to the exact rate a clock can provide. |