On Mon, May 04, 2020 at 10:44:47PM +0200, Alexandre Belloni wrote:
> On 04/05/2020 22:19:17+0200, Michał Mirosław wrote:
> > This exposes PROGx clocks for use in assigned-clocks DeviceTree property
> > for selecting PCKx parent clock.
> >
> > Signed-off-by: Michał Mirosław <mirq-linux@xxxxxxxxxxxx>
> > Acked-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
> > ---
> > v2: rebase and update to clk/clk-at91 branch
> > v3: rebase
> > v4: no changes
> > v5: no changes
> > v6: no changes
> > ---
> > drivers/clk/at91/at91rm9200.c | 6 ++++--
> > drivers/clk/at91/at91sam9260.c | 5 ++++-
> > drivers/clk/at91/at91sam9g45.c | 6 ++++--
> > drivers/clk/at91/at91sam9n12.c | 6 ++++--
> > drivers/clk/at91/at91sam9rl.c | 4 +++-
> > drivers/clk/at91/at91sam9x5.c | 4 +++-
> > drivers/clk/at91/pmc.c | 12 ++++++++++--
> > drivers/clk/at91/pmc.h | 5 ++++-
> > drivers/clk/at91/sam9x60.c | 4 +++-
> > drivers/clk/at91/sama5d2.c | 4 +++-
> > drivers/clk/at91/sama5d3.c | 6 ++++--
> > drivers/clk/at91/sama5d4.c | 4 +++-
> > include/dt-bindings/clock/at91.h | 1 +
> > 13 files changed, 50 insertions(+), 17 deletions(-)
> >
> > diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c
> > index c44a431b6c97..8da88e9a95d8 100644
> > --- a/drivers/clk/at91/at91rm9200.c
> > +++ b/drivers/clk/at91/at91rm9200.c
> > @@ -100,7 +100,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
> >
> > at91rm9200_pmc = pmc_data_allocate(PMC_MAIN + 1,
> > nck(at91rm9200_systemck),
> > - nck(at91rm9200_periphck), 0);
> > + nck(at91rm9200_periphck), 0, 4);
> > if (!at91rm9200_pmc)
> > return;
> >
> > @@ -159,6 +159,8 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
> > &at91rm9200_programmable_layout);
> > if (IS_ERR(hw))
> > goto err_free;
> > +
> > + at91rm9200_pmc->pchws[i] = hw;
> > }
> >
> > for (i = 0; i < ARRAY_SIZE(at91rm9200_systemck); i++) {
> > @@ -187,7 +189,7 @@ static void __init at91rm9200_pmc_setup(struct device_node *np)
> > return;
> >
> > err_free:
> > - pmc_data_free(at91rm9200_pmc);
> > + kfree(at91rm9200_pmc);
>
> I missed that in the previous review but shouldn't that change be part
> of the previous patch for bisectability ?
I was sure I already pushed all of them to the first patch...
Fixed in v7.
Best Regards
Michał Mirosław
