mirror of https://lore.kernel.org/linux-amlogic/
 help / color / mirror / Atom feed
From: mturquette@baylibre.com (Michael Turquette)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks
Date: Wed, 22 Mar 2017 18:28:18 -0700	[thread overview]
Message-ID: <149023249845.54062.2204386501151951780@resonance> (raw)
In-Reply-To: <4eeb2043-68f8-b7d7-e40d-18cd5c7659cb@baylibre.com>

Quoting Neil Armstrong (2017-03-22 02:14:40)
> On 03/22/2017 12:31 AM, Michael Turquette wrote:
> > Hi Neil,
> > 
> > Quoting Neil Armstrong (2017-03-09 04:53:46)
> >> The Mali is clocked by two identical clock paths behind a glitch free mux
> >> to safely change frequency while running.
> >>
> >> The two "mali_0" and "mali_1" clocks are composed of a mux, divider and gate.
> >> Expose these two clocks trees using generic clocks.
> >> Finally the glitch free mux is added as "mali" clock.
> >>
> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> >> ---
> >>  drivers/clk/meson/gxbb.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++
> >>  1 file changed, 139 insertions(+)
> >>
> >> diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
> >> index 5059c7b..d9f7fef 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};
> >> +static const char *gxbb_mali_0_1_parent_names[] = {
> >> +       "xtal", "gp0_pll", "mpll2", "mpll1", "fclk_div7",
> >> +       "fclk_div4", "fclk_div3", "fclk_div5"
> >> +};
> >> +
> >> +static struct clk_mux gxbb_mali_0_sel = {
> >> +       .reg = (void *)HHI_MALI_CLK_CNTL,
> >> +       .mask = 0x7,
> >> +       .shift = 9,
> >> +       .table = mux_table_mali_0_1,
> >> +       .lock = &clk_lock,
> >> +       .hw.init = &(struct clk_init_data){
> >> +               .name = "mali_0_sel",
> >> +               .ops = &clk_mux_ops,
> >> +               /*
> >> +                * bits 10:9 selects from 8 possible parents:
> >> +                * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
> >> +                * fclk_div4, fclk_div3, fclk_div5
> >> +                */
> >> +               .parent_names = gxbb_mali_0_1_parent_names,
> >> +               .num_parents = 8,
> >> +               .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> > 
> > Are all of these CLK_IGNORE_UNUSED flags necessary? If so, why? I'm just
> > wondering if this is yet another display-related use case where a
> > hand-off mechanism would work better?
> 
> Hi,
> 
> I'm just precocious about how these clocks will be handled, since the Mali driver
> is out of tree, I'm not sure about how they will be handled at all.

Sure, but out of tree driver users can always use the clk_disable_unused
bootarg if needed.

> 
> But I can test and remove these if we consider my out-of-tree driver platform
> code as reference.

Great, thanks.

Best regards,
Mike

> 
> Neil
> 
> > 
> > Thanks,
> > Mike
> > 
> >> +       },
> >> +};
> >> +
> >> +static struct clk_divider gxbb_mali_0_div = {
> >> +       .reg = (void *)HHI_MALI_CLK_CNTL,
> >> +       .shift = 0,
> >> +       .width = 7,
> >> +       .lock = &clk_lock,
> >> +       .hw.init = &(struct clk_init_data){
> >> +               .name = "mali_0_div",
> >> +               .ops = &clk_divider_ops,
> >> +               .parent_names = (const char *[]){ "mali_0_sel" },
> >> +               .num_parents = 1,
> >> +               .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >> +       },
> >> +};
> >> +
> >> +static struct clk_gate gxbb_mali_0 = {
> >> +       .reg = (void *)HHI_MALI_CLK_CNTL,
> >> +       .bit_idx = 8,
> >> +       .lock = &clk_lock,
> >> +       .hw.init = &(struct clk_init_data){
> >> +               .name = "mali_0",
> >> +               .ops = &clk_gate_ops,
> >> +               .parent_names = (const char *[]){ "mali_0_div" },
> >> +               .num_parents = 1,
> >> +               .flags = (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED),
> >> +       },
> >> +};
> >> +
> >> +static struct clk_mux gxbb_mali_1_sel = {
> >> +       .reg = (void *)HHI_MALI_CLK_CNTL,
> >> +       .mask = 0x7,
> >> +       .shift = 25,
> >> +       .table = mux_table_mali_0_1,
> >> +       .lock = &clk_lock,
> >> +       .hw.init = &(struct clk_init_data){
> >> +               .name = "mali_1_sel",
> >> +               .ops = &clk_mux_ops,
> >> +               /*
> >> +                * bits 10:9 selects from 8 possible parents:
> >> +                * xtal, gp0_pll, mpll2, mpll1, fclk_div7,
> >> +                * fclk_div4, fclk_div3, fclk_div5
> >> +                */
> >> +               .parent_names = gxbb_mali_0_1_parent_names,
> >> +               .num_parents = 8,
> >> +               .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >> +       },
> >> +};
> >> +
> >> +static struct clk_divider gxbb_mali_1_div = {
> >> +       .reg = (void *)HHI_MALI_CLK_CNTL,
> >> +       .shift = 16,
> >> +       .width = 7,
> >> +       .lock = &clk_lock,
> >> +       .hw.init = &(struct clk_init_data){
> >> +               .name = "mali_1_div",
> >> +               .ops = &clk_divider_ops,
> >> +               .parent_names = (const char *[]){ "mali_1_sel" },
> >> +               .num_parents = 1,
> >> +               .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >> +       },
> >> +};
> >> +
> >> +static struct clk_gate gxbb_mali_1 = {
> >> +       .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};
> >> +static const char *gxbb_mali_parent_names[] = {
> >> +       "mali_0", "mali_1"
> >> +};
> >> +
> >> +static struct clk_mux gxbb_mali = {
> >> +       .reg = (void *)HHI_MALI_CLK_CNTL,
> >> +       .mask = 1,
> >> +       .shift = 31,
> >> +       .table = mux_table_mali,
> >> +       .lock = &clk_lock,
> >> +       .hw.init = &(struct clk_init_data){
> >> +               .name = "mali",
> >> +               .ops = &clk_mux_ops,
> >> +               .parent_names = gxbb_mali_parent_names,
> >> +               .num_parents = 2,
> >> +               .flags = (CLK_SET_RATE_NO_REPARENT | CLK_IGNORE_UNUSED),
> >> +       },
> >> +};
> >> +
> >>  /* Everything Else (EE) domain gates */
> >>  static MESON_GATE(gxbb_ddr, HHI_GCLK_MPEG0, 0);
> >>  static MESON_GATE(gxbb_dos, HHI_GCLK_MPEG0, 1);
> >> @@ -827,6 +952,13 @@
> >>                 [CLKID_SAR_ADC_CLK]         = &gxbb_sar_adc_clk.hw,
> >>                 [CLKID_SAR_ADC_SEL]         = &gxbb_sar_adc_clk_sel.hw,
> >>                 [CLKID_SAR_ADC_DIV]         = &gxbb_sar_adc_clk_div.hw,
> >> +               [CLKID_MALI_0_SEL]          = &gxbb_mali_0_sel.hw,
> >> +               [CLKID_MALI_0_DIV]          = &gxbb_mali_0_div.hw,
> >> +               [CLKID_MALI_0]              = &gxbb_mali_0.hw,
> >> +               [CLKID_MALI_1_SEL]          = &gxbb_mali_1_sel.hw,
> >> +               [CLKID_MALI_1_DIV]          = &gxbb_mali_1_div.hw,
> >> +               [CLKID_MALI_1]              = &gxbb_mali_1.hw,
> >> +               [CLKID_MALI]                = &gxbb_mali.hw,
> >>         },
> >>         .num = NR_CLKS,
> >>  };
> >> @@ -930,16 +1062,23 @@
> >>         &gxbb_emmc_b,
> >>         &gxbb_emmc_c,
> >>         &gxbb_sar_adc_clk,
> >> +       &gxbb_mali_0,
> >> +       &gxbb_mali_1,
> >>  };
> >>  
> >>  static struct clk_mux *const 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 *const gxbb_clk_dividers[] = {
> >>         &gxbb_mpeg_clk_div,
> >>         &gxbb_sar_adc_clk_div,
> >> +       &gxbb_mali_0_div,
> >> +       &gxbb_mali_1_div,
> >>  };
> >>  
> >>  static int gxbb_clkc_probe(struct platform_device *pdev)
> >> -- 
> >> 1.9.1
> >>
> 

  reply	other threads:[~2017-03-23  1:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-09 12:53 [PATCH v3 0/3] meson-gx: Add mali-450 support Neil Armstrong
2017-03-09 12:53 ` [PATCH v3 1/3] clk: meson-gxbb: Add MALI clock IDS Neil Armstrong
2017-03-21 23:28   ` Michael Turquette
2017-03-09 12:53 ` [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks Neil Armstrong
2017-03-21 23:31   ` Michael Turquette
2017-03-22  9:14     ` Neil Armstrong
2017-03-23  1:28       ` Michael Turquette [this message]
2017-03-09 12:53 ` [PATCH v3 3/3] ARM64: dts: meson-gx: Add MALI nodes for GXBB and GXL Neil Armstrong
2017-03-11  0:42 ` [PATCH v3 0/3] meson-gx: Add mali-450 support Kevin Hilman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=149023249845.54062.2204386501151951780@resonance \
    --to=mturquette@baylibre.com \
    --cc=linus-amlogic@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®