diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2021-03-09 10:44:48 +0100 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2021-04-08 13:24:16 +0200 |
| commit | 68c70aae06e9660473a00fd7d68e0b53f4d7b6f4 (patch) | |
| tree | b3038814a70cd75b92ad6e8d0fe7d7faa437c334 | |
| parent | clocksource/drivers/pistachio: Fix trivial typo (diff) | |
| download | linux-68c70aae06e9660473a00fd7d68e0b53f4d7b6f4.tar.xz linux-68c70aae06e9660473a00fd7d68e0b53f4d7b6f4.zip | |
clocksource/drivers/sh_cmt: Don't use CMTOUT_IE with R-Car Gen2/3
CMTOUT_IE is only supported for older SoCs. Newer SoCs shall not set
this bit. So, add a version check.
Reported-by: Phong Hoang <phong.hoang.wz@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210309094448.31823-1-wsa+renesas@sang-engineering.com
| -rw-r--r-- | drivers/clocksource/sh_cmt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index c98f8851fd68..d7ed99f0001f 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -339,8 +339,9 @@ static int sh_cmt_enable(struct sh_cmt_channel *ch) sh_cmt_write_cmcsr(ch, SH_CMT16_CMCSR_CMIE | SH_CMT16_CMCSR_CKS512); } else { - sh_cmt_write_cmcsr(ch, SH_CMT32_CMCSR_CMM | - SH_CMT32_CMCSR_CMTOUT_IE | + u32 cmtout = ch->cmt->info->model <= SH_CMT_48BIT ? + SH_CMT32_CMCSR_CMTOUT_IE : 0; + sh_cmt_write_cmcsr(ch, cmtout | SH_CMT32_CMCSR_CMM | SH_CMT32_CMCSR_CMR_IRQ | SH_CMT32_CMCSR_CKS_RCLK8); } |