![Linus Torvalds](/assets/img/avatar_default.png)
general cleanups, but nothing too major. The majority of the diff goes to two SoCs, Actions Semi and Qualcomm. A brand new driver is introduced for Actions Semi so it takes up some lines to add all the different types, and the Qualcomm diff is there because we add support for two SoCs and it's quite a bit of data. Otherwise the big driver updates are on TI Davinci and Amlogic platforms. And then the long tail of driver updates for various fixes and stuff follows after that. Core: - debugfs cleanups removing error checking and an unused provider API - Removal of a clk init typedef that isn't used - Usage of match_string() to simplify parent string name matching - OF clk helpers moved to their own file (linux/of_clk.h) - Make clk warnings more readable across kernel versions New Drivers: - Qualcomm SDM845 GCC and Video clk controllers - Qualcomm MSM8998 GCC - Actions Semi S900 SoC support - Nuvoton npcm750 microcontroller clks - Amlogic axg AO clock controller Removed Drivers: - Deprecated Rockchip clk-gate driver Updates: - debugfs functions stopped checking return values - Support for the MSIOF module clocks on Rensas R-Car M3-N - Support for the new Rensas RZ/G1C and R-Car E3 SoCs - Qualcomm GDSC, RCG, and PLL updates for clk changes in new SoCs - Berlin and Amlogic SPDX tagging - Usage of of_clk_get_parent_count() in more places - Proper implementation of the CDEV1/2 clocks on Tegra20 - Allwinner H6 PRCM clock support and R40 EMAC support - Add critical flag to meson8b's fdiv2 as temporary fixup for ethernet - Round closest support for meson's mpll driver - Support for meson8b nand clocks and gxbb video decoder clocks - Mediatek mali clks - STM32MP1 fixes - Uniphier LD11/LD20 stream demux system clock -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE9L57QeeUxqYDyoaDrQKIl8bklSUFAlsWxugACgkQrQKIl8bk lSVs2A/9HOMsWeiYx1MESrXw6N2UknWeqeT/b1v8L/VOiptJg+OTExPbzmSylngv AXJAfIkCpguSMh9b310pA3DAzk5docmbQ4zL977yY+KXmOcDooCd34aG5a+tB3ie ugC8T2bQLrJdMp3hsqaKZsYzqe7LoW2NJgoliXDMA/QUBLpvHq+fcu2zOawingTA GNc3LGqP5Op7p09aPK30gtQNqLK5qGpHASa/AY7Y0PXlUeTZ8rmF06fcEAg5shkC CT57Zy2rSFB2RorEJarYXDPLRHMw/jxXtpMVXEy7zuz/3ajvvRiZDHv75+NaBru9 hDt1rzslzexEN4fYzj4AtGYRKyBrHbDaxG1qdIWPWVyoE0CEb+dZ1gH7/Ski5r+s z5D28NogC0T0sey6yWssyG3RLvkPJ5nxUhL++siHm1lbyo16LmhB1+nFvxrlzmBB 0V1xqEa7feYpD+JD66lJFb5ornHLwGtVYBpeiY+hrDR3ddWEe1IxaYGR2p9nHwSS Us/ZQdHIYBVEqoo3+BWnTn+HSQzmd/sqHqWnLlVWUHoomm5nXx18PeS87vFbcPv9 dMr+FFJ3Elubzcy5UZJPfNw+pb+teE7tYGQkQ3nbLRxT1YZOoIJZJDqNKxM1cgne 6c/VXJMEyBBn/w7Iru/3eWCZVQJGlmYS47DFDzduFvd3LMfmKIM= =KK/v -----END PGP SIGNATURE----- Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux Pull clk updates from Stephen Boyd: "This time we have a good set of changes to the core framework that do some general cleanups, but nothing too major. The majority of the diff goes to two SoCs, Actions Semi and Qualcomm. A brand new driver is introduced for Actions Semi so it takes up some lines to add all the different types, and the Qualcomm diff is there because we add support for two SoCs and it's quite a bit of data. Otherwise the big driver updates are on TI Davinci and Amlogic platforms. And then the long tail of driver updates for various fixes and stuff follows after that. Core: - debugfs cleanups removing error checking and an unused provider API - Removal of a clk init typedef that isn't used - Usage of match_string() to simplify parent string name matching - OF clk helpers moved to their own file (linux/of_clk.h) - Make clk warnings more readable across kernel versions New Drivers: - Qualcomm SDM845 GCC and Video clk controllers - Qualcomm MSM8998 GCC - Actions Semi S900 SoC support - Nuvoton npcm750 microcontroller clks - Amlogic axg AO clock controller Removed Drivers: - Deprecated Rockchip clk-gate driver Updates: - debugfs functions stopped checking return values - Support for the MSIOF module clocks on Rensas R-Car M3-N - Support for the new Rensas RZ/G1C and R-Car E3 SoCs - Qualcomm GDSC, RCG, and PLL updates for clk changes in new SoCs - Berlin and Amlogic SPDX tagging - Usage of of_clk_get_parent_count() in more places - Proper implementation of the CDEV1/2 clocks on Tegra20 - Allwinner H6 PRCM clock support and R40 EMAC support - Add critical flag to meson8b's fdiv2 as temporary fixup for ethernet - Round closest support for meson's mpll driver - Support for meson8b nand clocks and gxbb video decoder clocks - Mediatek mali clks - STM32MP1 fixes - Uniphier LD11/LD20 stream demux system clock" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (134 commits) clk: qcom: Export clk_fabia_pll_configure() clk: bcm: Update and add Stingray clock entries dt-bindings: clk: Update Stingray binding doc clk-si544: Properly round requested frequency to nearest match clk: ingenic: jz4770: Add 150us delay after enabling VPU clock clk: ingenic: jz4770: Enable power of AHB1 bus after ungating VPU clock clk: ingenic: jz4770: Modify C1CLK clock to disable CPU clock stop on idle clk: ingenic: jz4770: Change OTG from custom to standard gated clock clk: ingenic: Support specifying "wait for clock stable" delay clk: ingenic: Add support for clocks whose gate bit is inverted clk: use match_string() helper clk: bcm2835: use match_string() helper clk: Return void from debug_init op clk: remove clk_debugfs_add_file() clk: tegra: no need to check return value of debugfs_create functions clk: davinci: no need to check return value of debugfs_create functions clk: bcm2835: no need to check return value of debugfs_create functions clk: no need to check return value of debugfs_create functions clk: imx6: add EPIT clock support clk: mvebu: use correct bit for 98DX3236 NAND ...
178 lines
4.7 KiB
C
178 lines
4.7 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2018 BayLibre, SAS.
|
|
* Author: Jerome Brunet <jbrunet@baylibre.com>
|
|
*/
|
|
|
|
#include "clk-regmap.h"
|
|
|
|
static int clk_regmap_gate_endisable(struct clk_hw *hw, int enable)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct clk_regmap_gate_data *gate = clk_get_regmap_gate_data(clk);
|
|
int set = gate->flags & CLK_GATE_SET_TO_DISABLE ? 1 : 0;
|
|
|
|
set ^= enable;
|
|
|
|
return regmap_update_bits(clk->map, gate->offset, BIT(gate->bit_idx),
|
|
set ? BIT(gate->bit_idx) : 0);
|
|
}
|
|
|
|
static int clk_regmap_gate_enable(struct clk_hw *hw)
|
|
{
|
|
return clk_regmap_gate_endisable(hw, 1);
|
|
}
|
|
|
|
static void clk_regmap_gate_disable(struct clk_hw *hw)
|
|
{
|
|
clk_regmap_gate_endisable(hw, 0);
|
|
}
|
|
|
|
static int clk_regmap_gate_is_enabled(struct clk_hw *hw)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct clk_regmap_gate_data *gate = clk_get_regmap_gate_data(clk);
|
|
unsigned int val;
|
|
|
|
regmap_read(clk->map, gate->offset, &val);
|
|
if (gate->flags & CLK_GATE_SET_TO_DISABLE)
|
|
val ^= BIT(gate->bit_idx);
|
|
|
|
val &= BIT(gate->bit_idx);
|
|
|
|
return val ? 1 : 0;
|
|
}
|
|
|
|
const struct clk_ops clk_regmap_gate_ops = {
|
|
.enable = clk_regmap_gate_enable,
|
|
.disable = clk_regmap_gate_disable,
|
|
.is_enabled = clk_regmap_gate_is_enabled,
|
|
};
|
|
EXPORT_SYMBOL_GPL(clk_regmap_gate_ops);
|
|
|
|
static unsigned long clk_regmap_div_recalc_rate(struct clk_hw *hw,
|
|
unsigned long prate)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct clk_regmap_div_data *div = clk_get_regmap_div_data(clk);
|
|
unsigned int val;
|
|
int ret;
|
|
|
|
ret = regmap_read(clk->map, div->offset, &val);
|
|
if (ret)
|
|
/* Gives a hint that something is wrong */
|
|
return 0;
|
|
|
|
val >>= div->shift;
|
|
val &= clk_div_mask(div->width);
|
|
return divider_recalc_rate(hw, prate, val, div->table, div->flags,
|
|
div->width);
|
|
}
|
|
|
|
static long clk_regmap_div_round_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long *prate)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct clk_regmap_div_data *div = clk_get_regmap_div_data(clk);
|
|
unsigned int val;
|
|
int ret;
|
|
|
|
/* if read only, just return current value */
|
|
if (div->flags & CLK_DIVIDER_READ_ONLY) {
|
|
ret = regmap_read(clk->map, div->offset, &val);
|
|
if (ret)
|
|
/* Gives a hint that something is wrong */
|
|
return 0;
|
|
|
|
val >>= div->shift;
|
|
val &= clk_div_mask(div->width);
|
|
|
|
return divider_ro_round_rate(hw, rate, prate, div->table,
|
|
div->width, div->flags, val);
|
|
}
|
|
|
|
return divider_round_rate(hw, rate, prate, div->table, div->width,
|
|
div->flags);
|
|
}
|
|
|
|
static int clk_regmap_div_set_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long parent_rate)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct clk_regmap_div_data *div = clk_get_regmap_div_data(clk);
|
|
unsigned int val;
|
|
int ret;
|
|
|
|
ret = divider_get_val(rate, parent_rate, div->table, div->width,
|
|
div->flags);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
val = (unsigned int)ret << div->shift;
|
|
return regmap_update_bits(clk->map, div->offset,
|
|
clk_div_mask(div->width) << div->shift, val);
|
|
};
|
|
|
|
/* Would prefer clk_regmap_div_ro_ops but clashes with qcom */
|
|
|
|
const struct clk_ops clk_regmap_divider_ops = {
|
|
.recalc_rate = clk_regmap_div_recalc_rate,
|
|
.round_rate = clk_regmap_div_round_rate,
|
|
.set_rate = clk_regmap_div_set_rate,
|
|
};
|
|
EXPORT_SYMBOL_GPL(clk_regmap_divider_ops);
|
|
|
|
const struct clk_ops clk_regmap_divider_ro_ops = {
|
|
.recalc_rate = clk_regmap_div_recalc_rate,
|
|
.round_rate = clk_regmap_div_round_rate,
|
|
};
|
|
EXPORT_SYMBOL_GPL(clk_regmap_divider_ro_ops);
|
|
|
|
static u8 clk_regmap_mux_get_parent(struct clk_hw *hw)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct clk_regmap_mux_data *mux = clk_get_regmap_mux_data(clk);
|
|
unsigned int val;
|
|
int ret;
|
|
|
|
ret = regmap_read(clk->map, mux->offset, &val);
|
|
if (ret)
|
|
return ret;
|
|
|
|
val >>= mux->shift;
|
|
val &= mux->mask;
|
|
return clk_mux_val_to_index(hw, mux->table, mux->flags, val);
|
|
}
|
|
|
|
static int clk_regmap_mux_set_parent(struct clk_hw *hw, u8 index)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct clk_regmap_mux_data *mux = clk_get_regmap_mux_data(clk);
|
|
unsigned int val = clk_mux_index_to_val(mux->table, mux->flags, index);
|
|
|
|
return regmap_update_bits(clk->map, mux->offset,
|
|
mux->mask << mux->shift,
|
|
val << mux->shift);
|
|
}
|
|
|
|
static int clk_regmap_mux_determine_rate(struct clk_hw *hw,
|
|
struct clk_rate_request *req)
|
|
{
|
|
struct clk_regmap *clk = to_clk_regmap(hw);
|
|
struct clk_regmap_mux_data *mux = clk_get_regmap_mux_data(clk);
|
|
|
|
return clk_mux_determine_rate_flags(hw, req, mux->flags);
|
|
}
|
|
|
|
const struct clk_ops clk_regmap_mux_ops = {
|
|
.get_parent = clk_regmap_mux_get_parent,
|
|
.set_parent = clk_regmap_mux_set_parent,
|
|
.determine_rate = clk_regmap_mux_determine_rate,
|
|
};
|
|
EXPORT_SYMBOL_GPL(clk_regmap_mux_ops);
|
|
|
|
const struct clk_ops clk_regmap_mux_ro_ops = {
|
|
.get_parent = clk_regmap_mux_get_parent,
|
|
};
|
|
EXPORT_SYMBOL_GPL(clk_regmap_mux_ro_ops);
|