Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1606084 > unrolled thread

Re: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks

Started byMichael Turquette <mturquette@baylibre.com>
First post2017-03-22 00:40 +0100
Last post2017-03-23 02:30 +0100
Articles 3 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  Re: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks Michael Turquette <mturquette@baylibre.com> - 2017-03-22 00:40 +0100
    Re: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks Neil Armstrong <narmstrong@baylibre.com> - 2017-03-22 10:20 +0100
      Re: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks Michael Turquette <mturquette@baylibre.com> - 2017-03-23 02:30 +0100

#1606084 — Re: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks

FromMichael Turquette <mturquette@baylibre.com>
Date2017-03-22 00:40 +0100
SubjectRe: [PATCH v3 2/3] clk: meson-gxbb: Add MALI clocks
Message-ID<tnBxE-1Vz-21@gated-at.bofh.it>
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?

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
> 

[toc] | [next] | [standalone]


#1606298

FromNeil Armstrong <narmstrong@baylibre.com>
Date2017-03-22 10:20 +0100
Message-ID<tnKAW-72-23@gated-at.bofh.it>
In reply to#1606084
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.

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

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
>>

[toc] | [prev] | [next] | [standalone]


#1607113

FromMichael Turquette <mturquette@baylibre.com>
Date2017-03-23 02:30 +0100
Message-ID<tnZJE-3fP-5@gated-at.bofh.it>
In reply to#1606298
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
> >>
> 

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web