Skip to content

Commit a3825a7

Browse files
committed
Merge tag 'timers-v6.10-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/source updates from Daniel Lezcano: - Add the R9A09G057 compatible bindings in the DT documentation and add specific code to deal with the probe routine being called twice (Geert Uytterhoeven) - Remove unused field in the struct dmtimer in the TI driver (Christophe JAILLET) - Constify the hisi_161010101_oem_info variable in the ARM arch timer (Stephen Boyd) Link: https://lore.kernel.org/lkml/7ca1c46a-93e6-4f67-bee3-623cb56764fa@linaro.org
2 parents ddd9120 + 2030a7e commit a3825a7

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

Documentation/devicetree/bindings/timer/renesas,ostm.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- renesas,r9a07g043-ostm # RZ/G2UL and RZ/Five
2727
- renesas,r9a07g044-ostm # RZ/G2{L,LC}
2828
- renesas,r9a07g054-ostm # RZ/V2L
29+
- renesas,r9a09g057-ostm # RZ/V2H(P)
2930
- const: renesas,ostm # Generic
3031

3132
reg:
@@ -58,6 +59,7 @@ if:
5859
- renesas,r9a07g043-ostm
5960
- renesas,r9a07g044-ostm
6061
- renesas,r9a07g054-ostm
62+
- renesas,r9a09g057-ostm
6163
then:
6264
required:
6365
- resets

drivers/clocksource/arm_arch_timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ static u64 notrace hisi_161010101_read_cntvct_el0(void)
331331
return __hisi_161010101_read_reg(cntvct_el0);
332332
}
333333

334-
static struct ate_acpi_oem_info hisi_161010101_oem_info[] = {
334+
static const struct ate_acpi_oem_info hisi_161010101_oem_info[] = {
335335
/*
336336
* Note that trailing spaces are required to properly match
337337
* the OEM table information.

drivers/clocksource/renesas-ostm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ static int __init ostm_init(struct device_node *np)
210210
pr_info("%pOF: used for clock events\n", np);
211211
}
212212

213+
of_node_set_flag(np, OF_POPULATED);
213214
return 0;
214215

215216
err_cleanup:
@@ -224,7 +225,7 @@ static int __init ostm_init(struct device_node *np)
224225

225226
TIMER_OF_DECLARE(ostm, "renesas,ostm", ostm_init);
226227

227-
#ifdef CONFIG_ARCH_RZG2L
228+
#if defined(CONFIG_ARCH_RZG2L) || defined(CONFIG_ARCH_R9A09G057)
228229
static int __init ostm_probe(struct platform_device *pdev)
229230
{
230231
struct device *dev = &pdev->dev;

drivers/clocksource/timer-ti-dm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ struct dmtimer {
129129
void __iomem *func_base; /* function register base */
130130

131131
atomic_t enabled;
132-
unsigned long rate;
133132
unsigned reserved:1;
134133
unsigned posted:1;
135134
unsigned omap1:1;

0 commit comments

Comments
 (0)