| Message ID | e5dea828-5f4c-e88e-034a-163d98e5f522@cogentembedded.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | Add R-Car gen3 SoC support to the CMT driver | expand |
On Wed, Sep 12, 2018 at 11:14:14PM +0300, Sergei Shtylyov wrote: > There's no good reason for the sh_cmt_of_table[] initializer to > violate the 80-column limit, especially after the commit 8d50e9476bb4 > ("clocksource/drivers/sh_cmt: Mark "renesas,cmt-48-gen2" deprecated") > partially fixed it -- fix the R-Car gen2 related entries as well. > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > Reviewed-by: Chris Paterson <chris.paterson2@renesas.com> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > > --- > Changes in version 2: > - refreshed the patch; > - added Chris' and Geert's tags. > > drivers/clocksource/sh_cmt.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > Index: tip/drivers/clocksource/sh_cmt.c > =================================================================== > --- tip.orig/drivers/clocksource/sh_cmt.c > +++ tip/drivers/clocksource/sh_cmt.c > @@ -935,8 +935,14 @@ static const struct of_device_id sh_cmt_ > .compatible = "renesas,cmt-48-gen2", > .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] > }, > - { .compatible = "renesas,rcar-gen2-cmt0", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] }, > - { .compatible = "renesas,rcar-gen2-cmt1", .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] }, > + { > + .compatible = "renesas,rcar-gen2-cmt0", > + .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] > + }, > + { > + .compatible = "renesas,rcar-gen2-cmt1", > + .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] > + }, > { } > }; > MODULE_DEVICE_TABLE(of, sh_cmt_of_table); >
Index: tip/drivers/clocksource/sh_cmt.c =================================================================== --- tip.orig/drivers/clocksource/sh_cmt.c +++ tip/drivers/clocksource/sh_cmt.c @@ -935,8 +935,14 @@ static const struct of_device_id sh_cmt_ .compatible = "renesas,cmt-48-gen2", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] }, - { .compatible = "renesas,rcar-gen2-cmt0", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] }, - { .compatible = "renesas,rcar-gen2-cmt1", .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] }, + { + .compatible = "renesas,rcar-gen2-cmt0", + .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] + }, + { + .compatible = "renesas,rcar-gen2-cmt1", + .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] + }, { } }; MODULE_DEVICE_TABLE(of, sh_cmt_of_table);
There's no good reason for the sh_cmt_of_table[] initializer to violate the 80-column limit, especially after the commit 8d50e9476bb4 ("clocksource/drivers/sh_cmt: Mark "renesas,cmt-48-gen2" deprecated") partially fixed it -- fix the R-Car gen2 related entries as well. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Reviewed-by: Chris Paterson <chris.paterson2@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Changes in version 2: - refreshed the patch; - added Chris' and Geert's tags. drivers/clocksource/sh_cmt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)