Hi Bui Duc,
Thank you for the patch.
On Friday 09 Sep 2016 20:43:12 bd-phuc@xxxxxxxxxxx wrote:
> From: Bui Duc Phuc <bd-phuc@xxxxxxxxxxx>
>
> Add support for the new R-Car Gen3 CMT0 and CMT1 bindings.
>
> Signed-off-by: Bui Duc Phuc <bd-phuc@xxxxxxxxxxx>
> ---
> drivers/clocksource/sh_cmt.c | 21 +++++++++++++++++++--
> 1 file changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
> index 103c493..1542aef 100644
> --- a/drivers/clocksource/sh_cmt.c
> +++ b/drivers/clocksource/sh_cmt.c
> @@ -69,6 +69,7 @@ enum sh_cmt_model {
> SH_CMT_32BIT_FAST,
> SH_CMT_48BIT,
> SH_CMT_48BIT_GEN2,
> + SH_CMT_48BIT_GEN3,
> };
>
> struct sh_cmt_info {
> @@ -230,6 +231,16 @@ static const struct sh_cmt_info sh_cmt_info[] = {
> .read_count = sh_cmt_read32,
> .write_count = sh_cmt_write32,
> },
> + [SH_CMT_48BIT_GEN3] = {
> + .model = SH_CMT_48BIT_GEN3,
> + .width = 32,
> + .overflow_bit = SH_CMT32_CMCSR_CMF,
> + .clear_bits = ~(SH_CMT32_CMCSR_CMF | SH_CMT32_CMCSR_OVF),
> + .read_control = sh_cmt_read32,
> + .write_control = sh_cmt_write32,
> + .read_count = sh_cmt_read32,
> + .write_count = sh_cmt_write32,
> + },
> };
>
> #define CMCSR 0 /* channel register */
> @@ -864,6 +875,7 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel
> *ch, unsigned int index, ch->cmt = cmt;
> ch->index = index;
> ch->hwidx = hwidx;
> + ch->timer_bit = hwidx;
>
> /*
> * Compute the address of the channel control register block. For the
> @@ -888,6 +900,12 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel
> *ch, unsigned int index, case SH_CMT_48BIT_GEN2:
> ch->iostart = cmt->mapbase + ch->hwidx * 0x100;
> ch->ioctrl = ch->iostart + 0x10;
> + ch->timer_bit = 0;
> + break;
> + case SH_CMT_48BIT_GEN3:
> + ch->iostart = cmt->mapbase + ch->hwidx * 0x100;
> + ch->ioctrl = ch->iostart + 0x10;
> + ch->timer_bit = 0;
> break;
> }
>
> @@ -899,8 +917,6 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel
> *ch, unsigned int index, ch->match_value = ch->max_match_value;
> raw_spin_lock_init(&ch->lock);
>
> - ch->timer_bit = cmt->info->model == SH_CMT_48BIT_GEN2 ? 0 : ch->hwidx;
> -
> ret = sh_cmt_register(ch, dev_name(&cmt->pdev->dev),
> clockevent, clocksource);
> if (ret) {
> @@ -944,6 +960,7 @@ static const struct of_device_id sh_cmt_of_table[]
> __maybe_unused = {
> { .compatible = "renesas,cmt-32-fast", .data =
> &sh_cmt_info[SH_CMT_32BIT_FAST] },
> { .compatible = "renesas,cmt-48", .data = &sh_cmt_info[SH_CMT_48BIT]
> },
> { .compatible = "renesas,cmt-48-gen2", .data =
> &sh_cmt_info[SH_CMT_48BIT_GEN2] },
> + { .compatible = "renesas,cmt-48-gen3", .data =
> &sh_cmt_info[SH_CMT_48BIT_GEN3] },
Given that the Gen2 and Gen3 CMT seem identical based on the above code, how
about just using SH_CMT_48BIT_GEN2 here ? You wouldn't need any of the above
changes.
> { }
> };
> MODULE_DEVICE_TABLE(of, sh_cmt_of_table);
--
Regards,
Laurent Pinchart
