| Message ID | 20221027082158.95895-5-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | R-Car CAN FD driver enhancements | expand |
Hi Biju, On Thu, Oct 27, 2022 at 10:22 AM Biju Das <biju.das.jz@bp.renesas.com> wrote: > R-Car has a clock divider for CAN FD clock within the IP, whereas > it is not available on RZ/G2L. > > Add postdiv variable to struct rcar_canfd_hw_info to take care of this > difference. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > --- > v2->v3: > * Replaced data type of postdiv from unsigned int->u8 to save memory. Thanks for the update! > --- a/drivers/net/can/rcar/rcar_canfd.c > +++ b/drivers/net/can/rcar/rcar_canfd.c > @@ -1943,9 +1947,9 @@ static int rcar_canfd_probe(struct platform_device *pdev) > } > fcan_freq = clk_get_rate(gpriv->can_clk); > > - if (gpriv->fcan == RCANFD_CANFDCLK && info->chip_id != RENESAS_RZG2L) > + if (gpriv->fcan == RCANFD_CANFDCLK) > /* CANFD clock is further divided by (1/2) within the IP */ may be further divided? > - fcan_freq /= 2; > + fcan_freq /= info->postdiv; > > addr = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(addr)) { Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Geert, Thanks for the feedback. > Subject: Re: [PATCH v3 4/6] can: rcar_canfd: Add postdiv to struct > rcar_canfd_hw_info > > Hi Biju, > > On Thu, Oct 27, 2022 at 10:22 AM Biju Das <biju.das.jz@bp.renesas.com> > wrote: > > R-Car has a clock divider for CAN FD clock within the IP, whereas it > > is not available on RZ/G2L. > > > > Add postdiv variable to struct rcar_canfd_hw_info to take care of > this > > difference. > > > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > > --- > > v2->v3: > > * Replaced data type of postdiv from unsigned int->u8 to save > memory. > > Thanks for the update! > > > --- a/drivers/net/can/rcar/rcar_canfd.c > > +++ b/drivers/net/can/rcar/rcar_canfd.c > > @@ -1943,9 +1947,9 @@ static int rcar_canfd_probe(struct > platform_device *pdev) > > } > > fcan_freq = clk_get_rate(gpriv->can_clk); > > > > - if (gpriv->fcan == RCANFD_CANFDCLK && info->chip_id != > RENESAS_RZG2L) > > + if (gpriv->fcan == RCANFD_CANFDCLK) > > /* CANFD clock is further divided by (1/2) within > the > > IP */ > > may be further divided? Yes, It make sense. Will send v4 with this change. /* CANFD clock may be further divided by (1/2) within the IP */ Cheers, Biju > > > - fcan_freq /= 2; > > + fcan_freq /= info->postdiv; > > > > addr = devm_platform_ioremap_resource(pdev, 0); > > if (IS_ERR(addr)) { > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- > geert@linux-m68k.org > > In personal conversations with technical people, I call myself a > hacker. But when I'm talking to journalists I just say "programmer" or > something like that. > -- Linus Torvalds
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index c8d44dc36515..bc5df7a39f91 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -526,6 +526,7 @@ struct rcar_canfd_global; struct rcar_canfd_hw_info { enum rcanfd_chip_id chip_id; u8 max_channels; + u8 postdiv; /* hardware features */ unsigned shared_global_irqs:1; /* Has shared global irqs */ }; @@ -600,17 +601,20 @@ static const struct can_bittiming_const rcar_canfd_bittiming_const = { static const struct rcar_canfd_hw_info rcar_gen3_hw_info = { .chip_id = RENESAS_RCAR_GEN3, .max_channels = 2, + .postdiv = 2, .shared_global_irqs = 1, }; static const struct rcar_canfd_hw_info rzg2l_hw_info = { .chip_id = RENESAS_RZG2L, + .postdiv = 1, .max_channels = 2, }; static const struct rcar_canfd_hw_info r8a779a0_hw_info = { .chip_id = RENESAS_R8A779A0, .max_channels = 8, + .postdiv = 2, .shared_global_irqs = 1, }; @@ -1943,9 +1947,9 @@ static int rcar_canfd_probe(struct platform_device *pdev) } fcan_freq = clk_get_rate(gpriv->can_clk); - if (gpriv->fcan == RCANFD_CANFDCLK && info->chip_id != RENESAS_RZG2L) + if (gpriv->fcan == RCANFD_CANFDCLK) /* CANFD clock is further divided by (1/2) within the IP */ - fcan_freq /= 2; + fcan_freq /= info->postdiv; addr = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(addr)) {
R-Car has a clock divider for CAN FD clock within the IP, whereas it is not available on RZ/G2L. Add postdiv variable to struct rcar_canfd_hw_info to take care of this difference. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- v2->v3: * Replaced data type of postdiv from unsigned int->u8 to save memory. v1->v2: * Replaced clk_postdiv->postdiv driver data variable. * Simplified the calculation for fcan_freq. --- drivers/net/can/rcar/rcar_canfd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)