diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2022-12-13 14:27:16 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-12-13 14:27:16 +0100 |
| commit | cfd1f6c16f7deadfe5269a76c1516405c4466481 (patch) | |
| tree | 44c0635e57e9627d9838c0d0d5801381b93ccccd /drivers/clocksource/timer-imx-sysctr.c | |
| parent | a9d9e46c755a189ccb44d91b8cf737742a975de8 (diff) | |
| parent | fd7b68b763c4dfa65e3c145c624427d5fd11202f (diff) | |
| download | linux-next-cfd1f6c16f7deadfe5269a76c1516405c4466481.tar.gz linux-next-cfd1f6c16f7deadfe5269a76c1516405c4466481.zip | |
Merge branch 'for-6.2/apple' into for-linus
- new quirks for select Apple keyboards (Kerem Karabay, Aditya Garg)
Diffstat (limited to 'drivers/clocksource/timer-imx-sysctr.c')
| -rw-r--r-- | drivers/clocksource/timer-imx-sysctr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-imx-sysctr.c b/drivers/clocksource/timer-imx-sysctr.c index 523e37662a6e..5a7a951c4efc 100644 --- a/drivers/clocksource/timer-imx-sysctr.c +++ b/drivers/clocksource/timer-imx-sysctr.c @@ -134,8 +134,10 @@ static int __init sysctr_timer_init(struct device_node *np) if (ret) return ret; - /* system counter clock is divided by 3 internally */ - to_sysctr.of_clk.rate /= SYS_CTR_CLK_DIV; + if (!of_property_read_bool(np, "nxp,no-divider")) { + /* system counter clock is divided by 3 internally */ + to_sysctr.of_clk.rate /= SYS_CTR_CLK_DIV; + } sys_ctr_base = timer_of_base(&to_sysctr); cmpcr = readl(sys_ctr_base + CMPCR); |