Commit a3825a76 authored by Thomas Gleixner's avatar Thomas Gleixner

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
parents ddd91209 2030a7e1
...@@ -26,6 +26,7 @@ properties: ...@@ -26,6 +26,7 @@ properties:
- renesas,r9a07g043-ostm # RZ/G2UL and RZ/Five - renesas,r9a07g043-ostm # RZ/G2UL and RZ/Five
- renesas,r9a07g044-ostm # RZ/G2{L,LC} - renesas,r9a07g044-ostm # RZ/G2{L,LC}
- renesas,r9a07g054-ostm # RZ/V2L - renesas,r9a07g054-ostm # RZ/V2L
- renesas,r9a09g057-ostm # RZ/V2H(P)
- const: renesas,ostm # Generic - const: renesas,ostm # Generic
reg: reg:
...@@ -58,6 +59,7 @@ if: ...@@ -58,6 +59,7 @@ if:
- renesas,r9a07g043-ostm - renesas,r9a07g043-ostm
- renesas,r9a07g044-ostm - renesas,r9a07g044-ostm
- renesas,r9a07g054-ostm - renesas,r9a07g054-ostm
- renesas,r9a09g057-ostm
then: then:
required: required:
- resets - resets
......
...@@ -331,7 +331,7 @@ static u64 notrace hisi_161010101_read_cntvct_el0(void) ...@@ -331,7 +331,7 @@ static u64 notrace hisi_161010101_read_cntvct_el0(void)
return __hisi_161010101_read_reg(cntvct_el0); return __hisi_161010101_read_reg(cntvct_el0);
} }
static struct ate_acpi_oem_info hisi_161010101_oem_info[] = { static const struct ate_acpi_oem_info hisi_161010101_oem_info[] = {
/* /*
* Note that trailing spaces are required to properly match * Note that trailing spaces are required to properly match
* the OEM table information. * the OEM table information.
......
...@@ -210,6 +210,7 @@ static int __init ostm_init(struct device_node *np) ...@@ -210,6 +210,7 @@ static int __init ostm_init(struct device_node *np)
pr_info("%pOF: used for clock events\n", np); pr_info("%pOF: used for clock events\n", np);
} }
of_node_set_flag(np, OF_POPULATED);
return 0; return 0;
err_cleanup: err_cleanup:
...@@ -224,7 +225,7 @@ static int __init ostm_init(struct device_node *np) ...@@ -224,7 +225,7 @@ static int __init ostm_init(struct device_node *np)
TIMER_OF_DECLARE(ostm, "renesas,ostm", ostm_init); TIMER_OF_DECLARE(ostm, "renesas,ostm", ostm_init);
#ifdef CONFIG_ARCH_RZG2L #if defined(CONFIG_ARCH_RZG2L) || defined(CONFIG_ARCH_R9A09G057)
static int __init ostm_probe(struct platform_device *pdev) static int __init ostm_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
......
...@@ -129,7 +129,6 @@ struct dmtimer { ...@@ -129,7 +129,6 @@ struct dmtimer {
void __iomem *func_base; /* function register base */ void __iomem *func_base; /* function register base */
atomic_t enabled; atomic_t enabled;
unsigned long rate;
unsigned reserved:1; unsigned reserved:1;
unsigned posted:1; unsigned posted:1;
unsigned omap1:1; unsigned omap1:1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment