diff options
author | Stephen Boyd <sboyd@kernel.org> | 2019-09-20 00:31:59 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2019-09-20 00:31:59 +0200 |
commit | ebd47c8434064687ab6641e837144e0a3ea3872d (patch) | |
tree | 2f0eb327eb76cf9e800164f277277d44545ee7c5 /drivers/clk/meson/g12a.c | |
parent | Merge branches 'clk-cdce-regulator', 'clk-bcm', 'clk-evict-parent-cache' and ... (diff) | |
parent | clk: Make clk_bulk_get_all() return a valid "id" (diff) | |
parent | clk: at91: allow 24 Mhz clock as input for PLL (diff) | |
parent | clk: sprd: add missing kfree (diff) | |
download | linux-ebd47c8434064687ab6641e837144e0a3ea3872d.tar.xz linux-ebd47c8434064687ab6641e837144e0a3ea3872d.zip |
Merge branches 'clk-bulk-fix', 'clk-at91' and 'clk-sprd' into clk-next
- Make clk_bulk_get_all() return an 'id' corresponding to clock-names
* clk-bulk-fix:
clk: Make clk_bulk_get_all() return a valid "id"
* clk-at91:
clk: at91: allow 24 Mhz clock as input for PLL
clk: at91: select parent if main oscillator or bypass is enabled
clk: at91: fix update bit maps on CFG_MOR write
* clk-sprd:
clk: sprd: add missing kfree