Merge tag 'clk-meson-v6.10-1' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk driver updates from Jerome Brunet: - s4/a1: add regmap maximum register for proper debugfs dump - s4: add MODULE_DEVICE_TABLE() on pll and periph controllers - pll driver: print clock name on lock error to help debug - vclk: finish dsi clock path support - license: fix occurence "GPL v2" as reported by checkpatch * tag 'clk-meson-v6.10-1' of https://github.com/BayLibre/clk-meson: clk: meson: s4: fix module autoloading clk: meson: fix module license to GPL only clk: meson: g12a: make VCLK2 and ENCL clock path configurable by CCF clk: meson: add vclk driver clk: meson: pll: print out pll name when unable to lock it clk: meson: s4: pll: determine maximum register in regmap config clk: meson: s4: peripherals: determine maximum register in regmap config clk: meson: a1: pll: determine maximum register in regmap config clk: meson: a1: peripherals: determine maximum register in regmap config
This commit is contained in:
@@ -30,6 +30,10 @@ config COMMON_CLK_MESON_VID_PLL_DIV
|
||||
tristate
|
||||
select COMMON_CLK_MESON_REGMAP
|
||||
|
||||
config COMMON_CLK_MESON_VCLK
|
||||
tristate
|
||||
select COMMON_CLK_MESON_REGMAP
|
||||
|
||||
config COMMON_CLK_MESON_CLKC_UTILS
|
||||
tristate
|
||||
|
||||
@@ -140,6 +144,7 @@ config COMMON_CLK_G12A
|
||||
select COMMON_CLK_MESON_EE_CLKC
|
||||
select COMMON_CLK_MESON_CPU_DYNDIV
|
||||
select COMMON_CLK_MESON_VID_PLL_DIV
|
||||
select COMMON_CLK_MESON_VCLK
|
||||
select MFD_SYSCON
|
||||
help
|
||||
Support for the clock controller on Amlogic S905D2, S905X2 and S905Y2
|
||||
|
||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_COMMON_CLK_MESON_PLL) += clk-pll.o
|
||||
obj-$(CONFIG_COMMON_CLK_MESON_REGMAP) += clk-regmap.o
|
||||
obj-$(CONFIG_COMMON_CLK_MESON_SCLK_DIV) += sclk-div.o
|
||||
obj-$(CONFIG_COMMON_CLK_MESON_VID_PLL_DIV) += vid-pll-div.o
|
||||
obj-$(CONFIG_COMMON_CLK_MESON_VCLK) += vclk.o
|
||||
|
||||
# Amlogic Clock controllers
|
||||
|
||||
|
||||
@@ -2187,6 +2187,7 @@ static struct regmap_config a1_periphs_regmap_cfg = {
|
||||
.reg_bits = 32,
|
||||
.val_bits = 32,
|
||||
.reg_stride = 4,
|
||||
.max_register = DMC_CLK_CTRL,
|
||||
};
|
||||
|
||||
static struct meson_clk_hw_data a1_periphs_clks = {
|
||||
|
||||
@@ -299,6 +299,7 @@ static struct regmap_config a1_pll_regmap_cfg = {
|
||||
.reg_bits = 32,
|
||||
.val_bits = 32,
|
||||
.reg_stride = 4,
|
||||
.max_register = ANACTRL_HIFIPLL_STS,
|
||||
};
|
||||
|
||||
static struct meson_clk_hw_data a1_pll_clks = {
|
||||
|
||||
@@ -340,4 +340,4 @@ static struct platform_driver axg_aoclkc_driver = {
|
||||
};
|
||||
|
||||
module_platform_driver(axg_aoclkc_driver);
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -1877,4 +1877,4 @@ module_platform_driver(axg_audio_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Amlogic AXG/G12A/SM1 Audio Clock driver");
|
||||
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -2185,4 +2185,4 @@ static struct platform_driver axg_driver = {
|
||||
};
|
||||
|
||||
module_platform_driver(axg_driver);
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -69,4 +69,4 @@ EXPORT_SYMBOL_GPL(meson_clk_cpu_dyndiv_ops);
|
||||
|
||||
MODULE_DESCRIPTION("Amlogic CPU Dynamic Clock divider");
|
||||
MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -140,4 +140,4 @@ EXPORT_SYMBOL_GPL(meson_clk_dualdiv_ro_ops);
|
||||
MODULE_DESCRIPTION("Amlogic dual divider driver");
|
||||
MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
|
||||
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -177,4 +177,4 @@ EXPORT_SYMBOL_GPL(meson_clk_mpll_ops);
|
||||
|
||||
MODULE_DESCRIPTION("Amlogic MPLL driver");
|
||||
MODULE_AUTHOR("Michael Turquette <mturquette@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -183,4 +183,4 @@ EXPORT_SYMBOL_GPL(meson_sclk_ws_inv_ops);
|
||||
|
||||
MODULE_DESCRIPTION("Amlogic phase driver");
|
||||
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -436,8 +436,8 @@ static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate,
|
||||
|
||||
ret = meson_clk_pll_enable(hw);
|
||||
if (ret) {
|
||||
pr_warn("%s: pll did not lock, trying to restore old rate %lu\n",
|
||||
__func__, old_rate);
|
||||
pr_warn("%s: pll %s didn't lock, trying to set old rate %lu\n",
|
||||
__func__, clk_hw_get_name(hw), old_rate);
|
||||
/*
|
||||
* FIXME: Do we really need/want this HACK ?
|
||||
* It looks unsafe. what happens if the clock gets into a
|
||||
@@ -486,4 +486,4 @@ EXPORT_SYMBOL_GPL(meson_clk_pll_ro_ops);
|
||||
MODULE_DESCRIPTION("Amlogic PLL driver");
|
||||
MODULE_AUTHOR("Carlo Caione <carlo@endlessm.com>");
|
||||
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -183,4 +183,4 @@ EXPORT_SYMBOL_GPL(clk_regmap_mux_ro_ops);
|
||||
|
||||
MODULE_DESCRIPTION("Amlogic regmap backed clock driver");
|
||||
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -475,4 +475,4 @@ static struct platform_driver g12a_aoclkc_driver = {
|
||||
};
|
||||
|
||||
module_platform_driver(g12a_aoclkc_driver);
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
+57
-21
@@ -22,6 +22,7 @@
|
||||
#include "clk-regmap.h"
|
||||
#include "clk-cpu-dyndiv.h"
|
||||
#include "vid-pll-div.h"
|
||||
#include "vclk.h"
|
||||
#include "meson-eeclk.h"
|
||||
#include "g12a.h"
|
||||
|
||||
@@ -3165,7 +3166,7 @@ static struct clk_regmap g12a_vclk2_sel = {
|
||||
.ops = &clk_regmap_mux_ops,
|
||||
.parent_hws = g12a_vclk_parent_hws,
|
||||
.num_parents = ARRAY_SIZE(g12a_vclk_parent_hws),
|
||||
.flags = CLK_SET_RATE_NO_REPARENT | CLK_GET_RATE_NOCACHE,
|
||||
.flags = CLK_SET_RATE_NO_REPARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3193,7 +3194,6 @@ static struct clk_regmap g12a_vclk2_input = {
|
||||
.ops = &clk_regmap_gate_ops,
|
||||
.parent_hws = (const struct clk_hw *[]) { &g12a_vclk2_sel.hw },
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3215,19 +3215,32 @@ static struct clk_regmap g12a_vclk_div = {
|
||||
};
|
||||
|
||||
static struct clk_regmap g12a_vclk2_div = {
|
||||
.data = &(struct clk_regmap_div_data){
|
||||
.offset = HHI_VIID_CLK_DIV,
|
||||
.shift = 0,
|
||||
.width = 8,
|
||||
.data = &(struct meson_vclk_div_data){
|
||||
.div = {
|
||||
.reg_off = HHI_VIID_CLK_DIV,
|
||||
.shift = 0,
|
||||
.width = 8,
|
||||
},
|
||||
.enable = {
|
||||
.reg_off = HHI_VIID_CLK_DIV,
|
||||
.shift = 16,
|
||||
.width = 1,
|
||||
},
|
||||
.reset = {
|
||||
.reg_off = HHI_VIID_CLK_DIV,
|
||||
.shift = 17,
|
||||
.width = 1,
|
||||
},
|
||||
.flags = CLK_DIVIDER_ROUND_CLOSEST,
|
||||
},
|
||||
.hw.init = &(struct clk_init_data){
|
||||
.name = "vclk2_div",
|
||||
.ops = &clk_regmap_divider_ops,
|
||||
.ops = &meson_vclk_div_ops,
|
||||
.parent_hws = (const struct clk_hw *[]) {
|
||||
&g12a_vclk2_input.hw
|
||||
},
|
||||
.num_parents = 1,
|
||||
.flags = CLK_GET_RATE_NOCACHE,
|
||||
.flags = CLK_SET_RATE_GATE,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3246,16 +3259,24 @@ static struct clk_regmap g12a_vclk = {
|
||||
};
|
||||
|
||||
static struct clk_regmap g12a_vclk2 = {
|
||||
.data = &(struct clk_regmap_gate_data){
|
||||
.offset = HHI_VIID_CLK_CNTL,
|
||||
.bit_idx = 19,
|
||||
.data = &(struct meson_vclk_gate_data){
|
||||
.enable = {
|
||||
.reg_off = HHI_VIID_CLK_CNTL,
|
||||
.shift = 19,
|
||||
.width = 1,
|
||||
},
|
||||
.reset = {
|
||||
.reg_off = HHI_VIID_CLK_CNTL,
|
||||
.shift = 15,
|
||||
.width = 1,
|
||||
},
|
||||
},
|
||||
.hw.init = &(struct clk_init_data) {
|
||||
.name = "vclk2",
|
||||
.ops = &clk_regmap_gate_ops,
|
||||
.ops = &meson_vclk_gate_ops,
|
||||
.parent_hws = (const struct clk_hw *[]) { &g12a_vclk2_div.hw },
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3339,7 +3360,7 @@ static struct clk_regmap g12a_vclk2_div1 = {
|
||||
.ops = &clk_regmap_gate_ops,
|
||||
.parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw },
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3353,7 +3374,7 @@ static struct clk_regmap g12a_vclk2_div2_en = {
|
||||
.ops = &clk_regmap_gate_ops,
|
||||
.parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw },
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3367,7 +3388,7 @@ static struct clk_regmap g12a_vclk2_div4_en = {
|
||||
.ops = &clk_regmap_gate_ops,
|
||||
.parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw },
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3381,7 +3402,7 @@ static struct clk_regmap g12a_vclk2_div6_en = {
|
||||
.ops = &clk_regmap_gate_ops,
|
||||
.parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw },
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3395,7 +3416,7 @@ static struct clk_regmap g12a_vclk2_div12_en = {
|
||||
.ops = &clk_regmap_gate_ops,
|
||||
.parent_hws = (const struct clk_hw *[]) { &g12a_vclk2.hw },
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3461,6 +3482,7 @@ static struct clk_fixed_factor g12a_vclk2_div2 = {
|
||||
&g12a_vclk2_div2_en.hw
|
||||
},
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3474,6 +3496,7 @@ static struct clk_fixed_factor g12a_vclk2_div4 = {
|
||||
&g12a_vclk2_div4_en.hw
|
||||
},
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3487,6 +3510,7 @@ static struct clk_fixed_factor g12a_vclk2_div6 = {
|
||||
&g12a_vclk2_div6_en.hw
|
||||
},
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3500,6 +3524,7 @@ static struct clk_fixed_factor g12a_vclk2_div12 = {
|
||||
&g12a_vclk2_div12_en.hw
|
||||
},
|
||||
.num_parents = 1,
|
||||
.flags = CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3561,7 +3586,7 @@ static struct clk_regmap g12a_cts_encl_sel = {
|
||||
.ops = &clk_regmap_mux_ops,
|
||||
.parent_hws = g12a_cts_parent_hws,
|
||||
.num_parents = ARRAY_SIZE(g12a_cts_parent_hws),
|
||||
.flags = CLK_SET_RATE_NO_REPARENT | CLK_GET_RATE_NOCACHE,
|
||||
.flags = CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3717,15 +3742,26 @@ static struct clk_regmap g12a_mipi_dsi_pxclk_sel = {
|
||||
.ops = &clk_regmap_mux_ops,
|
||||
.parent_hws = g12a_mipi_dsi_pxclk_parent_hws,
|
||||
.num_parents = ARRAY_SIZE(g12a_mipi_dsi_pxclk_parent_hws),
|
||||
.flags = CLK_SET_RATE_NO_REPARENT,
|
||||
.flags = CLK_SET_RATE_NO_REPARENT | CLK_SET_RATE_PARENT,
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
* FIXME: Force as bypass by forcing a single /1 table entry, and doensn't on boot value
|
||||
* when setting a clock whith this node in the clock path, but doesn't garantee the divider
|
||||
* is at /1 at boot until a rate is set.
|
||||
*/
|
||||
static const struct clk_div_table g12a_mipi_dsi_pxclk_div_table[] = {
|
||||
{ .val = 0, .div = 1 },
|
||||
{ /* sentinel */ },
|
||||
};
|
||||
|
||||
static struct clk_regmap g12a_mipi_dsi_pxclk_div = {
|
||||
.data = &(struct clk_regmap_div_data){
|
||||
.offset = HHI_MIPIDSI_PHY_CLK_CNTL,
|
||||
.shift = 0,
|
||||
.width = 7,
|
||||
.table = g12a_mipi_dsi_pxclk_div_table,
|
||||
},
|
||||
.hw.init = &(struct clk_init_data){
|
||||
.name = "mipi_dsi_pxclk_div",
|
||||
@@ -5578,4 +5614,4 @@ static struct platform_driver g12a_driver = {
|
||||
};
|
||||
|
||||
module_platform_driver(g12a_driver);
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -300,4 +300,4 @@ static struct platform_driver gxbb_aoclkc_driver = {
|
||||
},
|
||||
};
|
||||
module_platform_driver(gxbb_aoclkc_driver);
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -3569,4 +3569,4 @@ static struct platform_driver gxbb_driver = {
|
||||
};
|
||||
|
||||
module_platform_driver(gxbb_driver);
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -89,4 +89,4 @@ int meson_aoclkc_probe(struct platform_device *pdev)
|
||||
return devm_of_clk_add_hw_provider(dev, meson_clk_hw_get, (void *)&data->hw_clks);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(meson_aoclkc_probe);
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -58,4 +58,4 @@ int meson_eeclkc_probe(struct platform_device *pdev)
|
||||
return devm_of_clk_add_hw_provider(dev, meson_clk_hw_get, (void *)&data->hw_clks);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(meson_eeclkc_probe);
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -3751,6 +3751,7 @@ static struct regmap_config clkc_regmap_config = {
|
||||
.reg_bits = 32,
|
||||
.val_bits = 32,
|
||||
.reg_stride = 4,
|
||||
.max_register = CLKCTRL_DEMOD_CLK_CTRL,
|
||||
};
|
||||
|
||||
static struct meson_clk_hw_data s4_periphs_clks = {
|
||||
@@ -3799,6 +3800,7 @@ static const struct of_device_id clkc_match_table[] = {
|
||||
},
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, clkc_match_table);
|
||||
|
||||
static struct platform_driver s4_driver = {
|
||||
.probe = meson_s4_periphs_probe,
|
||||
|
||||
@@ -798,6 +798,7 @@ static struct regmap_config clkc_regmap_config = {
|
||||
.reg_bits = 32,
|
||||
.val_bits = 32,
|
||||
.reg_stride = 4,
|
||||
.max_register = ANACTRL_HDMIPLL_CTRL0,
|
||||
};
|
||||
|
||||
static struct meson_clk_hw_data s4_pll_clks = {
|
||||
@@ -853,6 +854,7 @@ static const struct of_device_id clkc_match_table[] = {
|
||||
},
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, clkc_match_table);
|
||||
|
||||
static struct platform_driver s4_driver = {
|
||||
.probe = meson_s4_pll_probe,
|
||||
|
||||
@@ -251,4 +251,4 @@ EXPORT_SYMBOL_GPL(meson_sclk_div_ops);
|
||||
|
||||
MODULE_DESCRIPTION("Amlogic Sample divider driver");
|
||||
MODULE_AUTHOR("Jerome Brunet <jbrunet@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
/*
|
||||
* Copyright (c) 2024 Neil Armstrong <neil.armstrong@linaro.org>
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include "vclk.h"
|
||||
|
||||
/* The VCLK gate has a supplementary reset bit to pulse after ungating */
|
||||
|
||||
static inline struct meson_vclk_gate_data *
|
||||
clk_get_meson_vclk_gate_data(struct clk_regmap *clk)
|
||||
{
|
||||
return (struct meson_vclk_gate_data *)clk->data;
|
||||
}
|
||||
|
||||
static int meson_vclk_gate_enable(struct clk_hw *hw)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_gate_data *vclk = clk_get_meson_vclk_gate_data(clk);
|
||||
|
||||
meson_parm_write(clk->map, &vclk->enable, 1);
|
||||
|
||||
/* Do a reset pulse */
|
||||
meson_parm_write(clk->map, &vclk->reset, 1);
|
||||
meson_parm_write(clk->map, &vclk->reset, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void meson_vclk_gate_disable(struct clk_hw *hw)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_gate_data *vclk = clk_get_meson_vclk_gate_data(clk);
|
||||
|
||||
meson_parm_write(clk->map, &vclk->enable, 0);
|
||||
}
|
||||
|
||||
static int meson_vclk_gate_is_enabled(struct clk_hw *hw)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_gate_data *vclk = clk_get_meson_vclk_gate_data(clk);
|
||||
|
||||
return meson_parm_read(clk->map, &vclk->enable);
|
||||
}
|
||||
|
||||
const struct clk_ops meson_vclk_gate_ops = {
|
||||
.enable = meson_vclk_gate_enable,
|
||||
.disable = meson_vclk_gate_disable,
|
||||
.is_enabled = meson_vclk_gate_is_enabled,
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(meson_vclk_gate_ops);
|
||||
|
||||
/* The VCLK Divider has supplementary reset & enable bits */
|
||||
|
||||
static inline struct meson_vclk_div_data *
|
||||
clk_get_meson_vclk_div_data(struct clk_regmap *clk)
|
||||
{
|
||||
return (struct meson_vclk_div_data *)clk->data;
|
||||
}
|
||||
|
||||
static unsigned long meson_vclk_div_recalc_rate(struct clk_hw *hw,
|
||||
unsigned long prate)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk);
|
||||
|
||||
return divider_recalc_rate(hw, prate, meson_parm_read(clk->map, &vclk->div),
|
||||
vclk->table, vclk->flags, vclk->div.width);
|
||||
}
|
||||
|
||||
static int meson_vclk_div_determine_rate(struct clk_hw *hw,
|
||||
struct clk_rate_request *req)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk);
|
||||
|
||||
return divider_determine_rate(hw, req, vclk->table, vclk->div.width,
|
||||
vclk->flags);
|
||||
}
|
||||
|
||||
static int meson_vclk_div_set_rate(struct clk_hw *hw, unsigned long rate,
|
||||
unsigned long parent_rate)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk);
|
||||
int ret;
|
||||
|
||||
ret = divider_get_val(rate, parent_rate, vclk->table, vclk->div.width,
|
||||
vclk->flags);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
meson_parm_write(clk->map, &vclk->div, ret);
|
||||
|
||||
return 0;
|
||||
};
|
||||
|
||||
static int meson_vclk_div_enable(struct clk_hw *hw)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk);
|
||||
|
||||
/* Unreset the divider when ungating */
|
||||
meson_parm_write(clk->map, &vclk->reset, 0);
|
||||
meson_parm_write(clk->map, &vclk->enable, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void meson_vclk_div_disable(struct clk_hw *hw)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk);
|
||||
|
||||
/* Reset the divider when gating */
|
||||
meson_parm_write(clk->map, &vclk->enable, 0);
|
||||
meson_parm_write(clk->map, &vclk->reset, 1);
|
||||
}
|
||||
|
||||
static int meson_vclk_div_is_enabled(struct clk_hw *hw)
|
||||
{
|
||||
struct clk_regmap *clk = to_clk_regmap(hw);
|
||||
struct meson_vclk_div_data *vclk = clk_get_meson_vclk_div_data(clk);
|
||||
|
||||
return meson_parm_read(clk->map, &vclk->enable);
|
||||
}
|
||||
|
||||
const struct clk_ops meson_vclk_div_ops = {
|
||||
.recalc_rate = meson_vclk_div_recalc_rate,
|
||||
.determine_rate = meson_vclk_div_determine_rate,
|
||||
.set_rate = meson_vclk_div_set_rate,
|
||||
.enable = meson_vclk_div_enable,
|
||||
.disable = meson_vclk_div_disable,
|
||||
.is_enabled = meson_vclk_div_is_enabled,
|
||||
};
|
||||
EXPORT_SYMBOL_GPL(meson_vclk_div_ops);
|
||||
|
||||
MODULE_DESCRIPTION("Amlogic vclk clock driver");
|
||||
MODULE_AUTHOR("Neil Armstrong <neil.armstrong@linaro.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
@@ -0,0 +1,51 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Copyright (c) 2024 Neil Armstrong <neil.armstrong@linaro.org>
|
||||
*/
|
||||
|
||||
#ifndef __VCLK_H
|
||||
#define __VCLK_H
|
||||
|
||||
#include "clk-regmap.h"
|
||||
#include "parm.h"
|
||||
|
||||
/**
|
||||
* struct meson_vclk_gate_data - vclk_gate regmap backed specific data
|
||||
*
|
||||
* @enable: vclk enable field
|
||||
* @reset: vclk reset field
|
||||
* @flags: hardware-specific flags
|
||||
*
|
||||
* Flags:
|
||||
* Same as clk_gate except CLK_GATE_HIWORD_MASK which is ignored
|
||||
*/
|
||||
struct meson_vclk_gate_data {
|
||||
struct parm enable;
|
||||
struct parm reset;
|
||||
u8 flags;
|
||||
};
|
||||
|
||||
extern const struct clk_ops meson_vclk_gate_ops;
|
||||
|
||||
/**
|
||||
* struct meson_vclk_div_data - vclk_div regmap back specific data
|
||||
*
|
||||
* @div: divider field
|
||||
* @enable: vclk divider enable field
|
||||
* @reset: vclk divider reset field
|
||||
* @table: array of value/divider pairs, last entry should have div = 0
|
||||
*
|
||||
* Flags:
|
||||
* Same as clk_divider except CLK_DIVIDER_HIWORD_MASK which is ignored
|
||||
*/
|
||||
struct meson_vclk_div_data {
|
||||
struct parm div;
|
||||
struct parm enable;
|
||||
struct parm reset;
|
||||
const struct clk_div_table *table;
|
||||
u8 flags;
|
||||
};
|
||||
|
||||
extern const struct clk_ops meson_vclk_div_ops;
|
||||
|
||||
#endif /* __VCLK_H */
|
||||
@@ -96,4 +96,4 @@ EXPORT_SYMBOL_GPL(meson_vid_pll_div_ro_ops);
|
||||
|
||||
MODULE_DESCRIPTION("Amlogic video pll divider driver");
|
||||
MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
Reference in New Issue
Block a user