[PATCH v2 2/3] clk: meson-gxbb: Add MALI clocks
From: jbrunet@baylibre.com (Jerome Brunet)
Date: 2017-03-03 06:52:34
Also in:
linux-amlogic, linux-clk, lkml
On Thu, 2017-03-02 at 12:07 +0100, Neil Armstrong wrote:
Hi Stephen, On 03/01/2017 08:11 PM, Stephen Boyd wrote:quoted
On 03/01, Neil Armstrong wrote:quoted
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index a52063f..31f6090 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c@@ -634,6 +634,131 @@? }, ?}; ? +/* + * The MALI IP is clocked by two identical clocks (mali_0 and mali_1) + * muxed by a glitch-free switch. + */ + +static u32 mux_table_mali_0_1[] = {0, 1, 2, 3, 4, 5, 6, 7}; +const char *gxbb_mali_0_1_parent_names[] = {static?Will do !quoted
quoted
+ "xtal", "gp0_pll", "mpll2", "mpll1", "fclk_div7", + "fclk_div4", "fclk_div3", "fclk_div5" +}; +[..]quoted
+ .reg = (void *)HHI_MALI_CLK_CNTL, + .bit_idx = 24, + .lock = &clk_lock, + .hw.init = &(struct clk_init_data){ + .name = "mali_1", + .ops = &clk_gate_ops, + .parent_names = (const char *[]){ "mali_1_div" }, + .num_parents = 1, + .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED), + }, +}; + +static u32 mux_table_mali[] = {0, 1}; +const char *gxbb_mali_parent_names[] = {static?quoted
+ "mali_0", "mali_1" +};[...]quoted
?static struct clk_mux *gxbb_clk_muxes[] = { ? &gxbb_mpeg_clk_sel, ? &gxbb_sar_adc_clk_sel, + &gxbb_mali_0_sel, + &gxbb_mali_1_sel, + &gxbb_mali, ?}; ? ?static struct clk_divider *gxbb_clk_dividers[] = {Can these arrays be const? If so, please do that in a separate patch.Hmm, these were introduced by jerome, he should update them accordingly.
Will do
quoted
quoted
? &gxbb_mpeg_clk_div, ? &gxbb_sar_adc_clk_div, + &gxbb_mali_0_div, + &gxbb_mali_1_div, ?};Thanks, Neil