From mboxrd@z Thu Jan 1 00:00:00 1970 From: mturquette@baylibre.com (Michael Turquette) Date: Tue, 21 Mar 2017 16:10:31 -0700 Subject: [PATCH v2 4/9] clk: gxbb: put dividers and muxes in tables In-Reply-To: <20170309104154.28295-5-jbrunet@baylibre.com> References: <20170309104154.28295-1-jbrunet@baylibre.com> <20170309104154.28295-5-jbrunet@baylibre.com> Message-ID: <149013783116.54062.8867118335254325862@resonance> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org Quoting Jerome Brunet (2017-03-09 02:41:49) > Until now, there was only 2 dividers and 2 muxes declared for the gxbb > platform. With the ongoing work on various subsystem, including audio, > this is about to change. Use the same approach as gates for dividers and > muxes, putting them in tables to fix the register address at runtime. > > Signed-off-by: Jerome Brunet Looks good to me. Regards, Mike > --- > drivers/clk/meson/gxbb.c | 28 ++++++++++++++++++++-------- > 1 file changed, 20 insertions(+), 8 deletions(-) > > diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c > index c063287bb0ed..79e9313e6703 100644 > --- a/drivers/clk/meson/gxbb.c > +++ b/drivers/clk/meson/gxbb.c > @@ -902,6 +902,16 @@ static struct clk_gate *const gxbb_clk_gates[] = { > &gxbb_sar_adc_clk, > }; > > +static struct clk_mux *const gxbb_clk_muxes[] = { > + &gxbb_mpeg_clk_sel, > + &gxbb_sar_adc_clk_sel, > +}; > + > +static struct clk_divider *const gxbb_clk_dividers[] = { > + &gxbb_mpeg_clk_div, > + &gxbb_sar_adc_clk_div, > +}; > + > static int gxbb_clkc_probe(struct platform_device *pdev) > { > void __iomem *clk_base; > @@ -928,19 +938,21 @@ static int gxbb_clkc_probe(struct platform_device *pdev) > /* Populate the base address for CPU clk */ > gxbb_cpu_clk.base = clk_base; > > - /* Populate the base address for the MPEG clks */ > - gxbb_mpeg_clk_sel.reg = clk_base + (u64)gxbb_mpeg_clk_sel.reg; > - gxbb_mpeg_clk_div.reg = clk_base + (u64)gxbb_mpeg_clk_div.reg; > - > - /* Populate the base address for the SAR ADC clks */ > - gxbb_sar_adc_clk_sel.reg = clk_base + (u64)gxbb_sar_adc_clk_sel.reg; > - gxbb_sar_adc_clk_div.reg = clk_base + (u64)gxbb_sar_adc_clk_div.reg; > - > /* Populate base address for gates */ > for (i = 0; i < ARRAY_SIZE(gxbb_clk_gates); i++) > gxbb_clk_gates[i]->reg = clk_base + > (u64)gxbb_clk_gates[i]->reg; > > + /* Populate base address for muxes */ > + for (i = 0; i < ARRAY_SIZE(gxbb_clk_muxes); i++) > + gxbb_clk_muxes[i]->reg = clk_base + > + (u64)gxbb_clk_muxes[i]->reg; > + > + /* Populate base address for dividers */ > + for (i = 0; i < ARRAY_SIZE(gxbb_clk_dividers); i++) > + gxbb_clk_dividers[i]->reg = clk_base + > + (u64)gxbb_clk_dividers[i]->reg; > + > /* > * register all clks > */ > -- > 2.9.3 >