| Message ID | 4fc0bdc03033bbe43b31c89b6cc705e5f3498846.1697199949.git.ysato@users.sourceforge.jp (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Device Tree support for SH7751 based board | expand |
Hi Sato-san, Thanks for your patch! On Sat, Oct 14, 2023 at 4:54 PM Yoshinori Sato <ysato@users.sourceforge.jp> wrote: > Enables registration as a Clocksource in the case of OF. I think this is not a good description. What this patch does, is to add support for early registration using TIMER_OF_DECLARE(), so the timer can be used as a clocksource on SoCs that do not have any other suitable timer. Then I wondered: do you need this? On R-Mobile A1, the TMU is also used as a clocksource, how come it works there? The trick is to set preset_lpj based on the CPU core clock frequency. I see your v2 actually added that, but you dropped the code in v3. https://lore.kernel.org/linux-sh/236185b4a47f303332aafeacadd9c9652e650062.1694596125.git.ysato@users.sourceforge.jp Nevertheless, it doesn't work anymore, as you also removed the clock-frequency property from cpu@0 in DT... Adding that makes it work without this TMU patch. > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> > --- a/drivers/clocksource/sh_tmu.c > +++ b/drivers/clocksource/sh_tmu.c > @@ -403,7 +411,8 @@ static void sh_tmu_clock_event_resume(struct clock_event_device *ced) > } > > static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, > - const char *name) > + const char *name, > + struct device_node *np) "np" is unused in this function, hence this change is unneeded. > { > struct clock_event_device *ced = &ch->ced; > int ret; > static int sh_tmu_register(struct sh_tmu_channel *ch, const char *name, > + struct device_node *np, This change is unneeded... > bool clockevent, bool clocksource) > { > if (clockevent) { > ch->tmu->has_clockevent = true; > - sh_tmu_register_clockevent(ch, name); > + sh_tmu_register_clockevent(ch, name, np); ... as sh_tmu_register_clockevent() doesn't use "np". > } else if (clocksource) { > ch->tmu->has_clocksource = true; > sh_tmu_register_clocksource(ch, name); > @@ -465,53 +477,59 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index, > else > ch->base = tmu->mapbase + 8 + ch->index * 12; > > - ch->irq = platform_get_irq(tmu->pdev, index); > + if (tmu->pdev) > + ch->irq = platform_get_irq(tmu->pdev, index); > + else > + ch->irq = of_irq_get(np, index); You can use of_irq_get() uncondtionally. > if (ch->irq < 0) > return ch->irq; > > ch->cs_enabled = false; > ch->enable_count = 0; > > - return sh_tmu_register(ch, dev_name(&tmu->pdev->dev), > + return sh_tmu_register(ch, tmu->name, np, No need to pass np. > clockevent, clocksource); > } > > -static int sh_tmu_map_memory(struct sh_tmu_device *tmu) > +static int sh_tmu_map_memory(struct sh_tmu_device *tmu, struct device_node *np) > { > struct resource *res; > > - res = platform_get_resource(tmu->pdev, IORESOURCE_MEM, 0); > - if (!res) { > - dev_err(&tmu->pdev->dev, "failed to get I/O memory\n"); > - return -ENXIO; > - } > + if (tmu->pdev) { > + res = platform_get_resource(tmu->pdev, IORESOURCE_MEM, 0); > + if (!res) { > + pr_err("sh_tmu failed to get I/O memory\n"); > + return -ENXIO; > + } > + > + tmu->mapbase = ioremap(res->start, resource_size(res)); > + } else > + tmu->mapbase = of_iomap(np, 0); You can use of_iomap() unconditionally. > > - tmu->mapbase = ioremap(res->start, resource_size(res)); > if (tmu->mapbase == NULL) > return -ENXIO; > > return 0; > } > > -static int sh_tmu_parse_dt(struct sh_tmu_device *tmu) > +static int sh_tmu_parse_dt(struct sh_tmu_device *tmu, struct device_node *np) > { > - struct device_node *np = tmu->pdev->dev.of_node; > - > tmu->model = SH_TMU; > tmu->num_channels = 3; > > of_property_read_u32(np, "#renesas,channels", &tmu->num_channels); > > if (tmu->num_channels != 2 && tmu->num_channels != 3) { > - dev_err(&tmu->pdev->dev, "invalid number of channels %u\n", > - tmu->num_channels); > + pr_err("%s: invalid number of channels %u\n", > + tmu->name, tmu->num_channels); > return -EINVAL; > } > > return 0; > } > > -static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) > +static int sh_tmu_setup(struct sh_tmu_device *tmu, > + struct platform_device *pdev, struct device_node *np) > { > unsigned int i; > int ret; > @@ -531,14 +554,17 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) > tmu->model = id->driver_data; > tmu->num_channels = hweight8(cfg->channels_mask); > } else { > - dev_err(&tmu->pdev->dev, "missing platform data\n"); > + pr_err("%s missing platform data\n", tmu->name); > return -ENXIO; > } > > /* Get hold of clock. */ > - tmu->clk = clk_get(&tmu->pdev->dev, "fck"); > + if (pdev) > + tmu->clk = clk_get(&tmu->pdev->dev, "fck"); > + else > + tmu->clk = of_clk_get(np, 0); You can use of_clk_get() unconditionally. > if (IS_ERR(tmu->clk)) { > - dev_err(&tmu->pdev->dev, "cannot get clock\n"); > + pr_err("%s: cannot get clock\n", tmu->name); > return PTR_ERR(tmu->clk); > } > Gr{oetje,eeting}s, Geert
On Thu, 19 Oct 2023 01:04:57 +0900, Geert Uytterhoeven wrote: > > Hi Sato-san, > > Thanks for your patch! > > On Sat, Oct 14, 2023 at 4:54 PM Yoshinori Sato > <ysato@users.sourceforge.jp> wrote: > > Enables registration as a Clocksource in the case of OF. > > I think this is not a good description. > What this patch does, is to add support for early registration using > TIMER_OF_DECLARE(), so the timer can be used as a clocksource > on SoCs that do not have any other suitable timer. > > Then I wondered: do you need this? On R-Mobile A1, the TMU is also > used as a clocksource, how come it works there? > The trick is to set preset_lpj based on the CPU core clock frequency. > > I see your v2 actually added that, but you dropped the code in v3. > https://lore.kernel.org/linux-sh/236185b4a47f303332aafeacadd9c9652e650062.1694596125.git.ysato@users.sourceforge.jp > Nevertheless, it doesn't work anymore, as you also removed the > clock-frequency property from cpu@0 in DT... > Adding that makes it work without this TMU patch. Currently sh initializes the timer with a parameter called "earlytimer", but this does not seem to work correctly with CONFIG_OF. It will be initialized later when of_platform_depopulate is called, so it can be started, but I think this is incorrect initialization of the timer. I think it's better to follow the OF procedure rather than the old SH-specific framework. > > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> > > > --- a/drivers/clocksource/sh_tmu.c > > +++ b/drivers/clocksource/sh_tmu.c > > > @@ -403,7 +411,8 @@ static void sh_tmu_clock_event_resume(struct clock_event_device *ced) > > } > > > > static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, > > - const char *name) > > + const char *name, > > + struct device_node *np) > > "np" is unused in this function, hence this change is unneeded. > > > { > > struct clock_event_device *ced = &ch->ced; > > int ret; > > > static int sh_tmu_register(struct sh_tmu_channel *ch, const char *name, > > + struct device_node *np, > > This change is unneeded... > > > bool clockevent, bool clocksource) > > { > > if (clockevent) { > > ch->tmu->has_clockevent = true; > > - sh_tmu_register_clockevent(ch, name); > > + sh_tmu_register_clockevent(ch, name, np); > > ... as sh_tmu_register_clockevent() doesn't use "np". > > > } else if (clocksource) { > > ch->tmu->has_clocksource = true; > > sh_tmu_register_clocksource(ch, name); > > > @@ -465,53 +477,59 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index, > > else > > ch->base = tmu->mapbase + 8 + ch->index * 12; > > > > - ch->irq = platform_get_irq(tmu->pdev, index); > > + if (tmu->pdev) > > + ch->irq = platform_get_irq(tmu->pdev, index); > > + else > > + ch->irq = of_irq_get(np, index); > > You can use of_irq_get() uncondtionally. > > > if (ch->irq < 0) > > return ch->irq; > > > > ch->cs_enabled = false; > > ch->enable_count = 0; > > > > - return sh_tmu_register(ch, dev_name(&tmu->pdev->dev), > > + return sh_tmu_register(ch, tmu->name, np, > > No need to pass np. > > > clockevent, clocksource); > > } > > > > -static int sh_tmu_map_memory(struct sh_tmu_device *tmu) > > +static int sh_tmu_map_memory(struct sh_tmu_device *tmu, struct device_node *np) > > { > > struct resource *res; > > > > - res = platform_get_resource(tmu->pdev, IORESOURCE_MEM, 0); > > - if (!res) { > > - dev_err(&tmu->pdev->dev, "failed to get I/O memory\n"); > > - return -ENXIO; > > - } > > + if (tmu->pdev) { > > + res = platform_get_resource(tmu->pdev, IORESOURCE_MEM, 0); > > + if (!res) { > > + pr_err("sh_tmu failed to get I/O memory\n"); > > + return -ENXIO; > > + } > > + > > + tmu->mapbase = ioremap(res->start, resource_size(res)); > > + } else > > + tmu->mapbase = of_iomap(np, 0); > > You can use of_iomap() unconditionally. > > > > > - tmu->mapbase = ioremap(res->start, resource_size(res)); > > if (tmu->mapbase == NULL) > > return -ENXIO; > > > > return 0; > > } > > > > -static int sh_tmu_parse_dt(struct sh_tmu_device *tmu) > > +static int sh_tmu_parse_dt(struct sh_tmu_device *tmu, struct device_node *np) > > { > > - struct device_node *np = tmu->pdev->dev.of_node; > > - > > tmu->model = SH_TMU; > > tmu->num_channels = 3; > > > > of_property_read_u32(np, "#renesas,channels", &tmu->num_channels); > > > > if (tmu->num_channels != 2 && tmu->num_channels != 3) { > > - dev_err(&tmu->pdev->dev, "invalid number of channels %u\n", > > - tmu->num_channels); > > + pr_err("%s: invalid number of channels %u\n", > > + tmu->name, tmu->num_channels); > > return -EINVAL; > > } > > > > return 0; > > } > > > > -static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) > > +static int sh_tmu_setup(struct sh_tmu_device *tmu, > > + struct platform_device *pdev, struct device_node *np) > > { > > unsigned int i; > > int ret; > > > @@ -531,14 +554,17 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) > > tmu->model = id->driver_data; > > tmu->num_channels = hweight8(cfg->channels_mask); > > } else { > > - dev_err(&tmu->pdev->dev, "missing platform data\n"); > > + pr_err("%s missing platform data\n", tmu->name); > > return -ENXIO; > > } > > > > /* Get hold of clock. */ > > - tmu->clk = clk_get(&tmu->pdev->dev, "fck"); > > + if (pdev) > > + tmu->clk = clk_get(&tmu->pdev->dev, "fck"); > > + else > > + tmu->clk = of_clk_get(np, 0); > > You can use of_clk_get() unconditionally. > > > if (IS_ERR(tmu->clk)) { > > - dev_err(&tmu->pdev->dev, "cannot get clock\n"); > > + pr_err("%s: cannot get clock\n", tmu->name); > > return PTR_ERR(tmu->clk); > > } > > > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index beffff81c00f..e4ae83c9f7d4 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c @@ -17,6 +17,8 @@ #include <linux/irq.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/pm_runtime.h> @@ -65,6 +67,7 @@ struct sh_tmu_device { bool has_clockevent; bool has_clocksource; + const char *name; }; #define TSTR -1 /* shared register */ @@ -148,8 +151,8 @@ static int __sh_tmu_enable(struct sh_tmu_channel *ch) /* enable clock */ ret = clk_enable(ch->tmu->clk); if (ret) { - dev_err(&ch->tmu->pdev->dev, "ch%u: cannot enable clock\n", - ch->index); + pr_err("%s ch%u: cannot enable clock\n", + ch->tmu->name, ch->index); return ret; } @@ -174,9 +177,10 @@ static int sh_tmu_enable(struct sh_tmu_channel *ch) if (ch->enable_count++ > 0) return 0; - pm_runtime_get_sync(&ch->tmu->pdev->dev); - dev_pm_syscore_device(&ch->tmu->pdev->dev, true); - + if (ch->tmu->pdev) { + pm_runtime_get_sync(&ch->tmu->pdev->dev); + dev_pm_syscore_device(&ch->tmu->pdev->dev, true); + } return __sh_tmu_enable(ch); } @@ -202,8 +206,10 @@ static void sh_tmu_disable(struct sh_tmu_channel *ch) __sh_tmu_disable(ch); - dev_pm_syscore_device(&ch->tmu->pdev->dev, false); - pm_runtime_put(&ch->tmu->pdev->dev); + if (ch->tmu->pdev) { + dev_pm_syscore_device(&ch->tmu->pdev->dev, false); + pm_runtime_put(&ch->tmu->pdev->dev); + } } static void sh_tmu_set_next(struct sh_tmu_channel *ch, unsigned long delta, @@ -245,7 +251,7 @@ static irqreturn_t sh_tmu_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct sh_tmu_channel *cs_to_sh_tmu(struct clocksource *cs) +static inline struct sh_tmu_channel *cs_to_sh_tmu(struct clocksource *cs) { return container_of(cs, struct sh_tmu_channel, cs); } @@ -292,7 +298,8 @@ static void sh_tmu_clocksource_suspend(struct clocksource *cs) if (--ch->enable_count == 0) { __sh_tmu_disable(ch); - dev_pm_genpd_suspend(&ch->tmu->pdev->dev); + if (ch->tmu->pdev) + dev_pm_genpd_suspend(&ch->tmu->pdev->dev); } } @@ -304,7 +311,8 @@ static void sh_tmu_clocksource_resume(struct clocksource *cs) return; if (ch->enable_count++ == 0) { - dev_pm_genpd_resume(&ch->tmu->pdev->dev); + if (ch->tmu->pdev) + dev_pm_genpd_resume(&ch->tmu->pdev->dev); __sh_tmu_enable(ch); } } @@ -324,14 +332,14 @@ static int sh_tmu_register_clocksource(struct sh_tmu_channel *ch, cs->mask = CLOCKSOURCE_MASK(32); cs->flags = CLOCK_SOURCE_IS_CONTINUOUS; - dev_info(&ch->tmu->pdev->dev, "ch%u: used as clock source\n", - ch->index); + pr_info("%s ch%u: used as clock source\n", + ch->tmu->name, ch->index); clocksource_register_hz(cs, ch->tmu->rate); return 0; } -static struct sh_tmu_channel *ced_to_sh_tmu(struct clock_event_device *ced) +static inline struct sh_tmu_channel *ced_to_sh_tmu(struct clock_event_device *ced) { return container_of(ced, struct sh_tmu_channel, ced); } @@ -364,8 +372,8 @@ static int sh_tmu_clock_event_set_state(struct clock_event_device *ced, if (clockevent_state_oneshot(ced) || clockevent_state_periodic(ced)) sh_tmu_disable(ch); - dev_info(&ch->tmu->pdev->dev, "ch%u: used for %s clock events\n", - ch->index, periodic ? "periodic" : "oneshot"); + pr_info("%s ch%u: used for %s clock events\n", + ch->tmu->name, ch->index, periodic ? "periodic" : "oneshot"); sh_tmu_clock_event_start(ch, periodic); return 0; } @@ -403,7 +411,8 @@ static void sh_tmu_clock_event_resume(struct clock_event_device *ced) } static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, - const char *name) + const char *name, + struct device_node *np) { struct clock_event_device *ced = &ch->ced; int ret; @@ -417,30 +426,32 @@ static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch, ced->set_state_shutdown = sh_tmu_clock_event_shutdown; ced->set_state_periodic = sh_tmu_clock_event_set_periodic; ced->set_state_oneshot = sh_tmu_clock_event_set_oneshot; - ced->suspend = sh_tmu_clock_event_suspend; - ced->resume = sh_tmu_clock_event_resume; - - dev_info(&ch->tmu->pdev->dev, "ch%u: used for clock events\n", - ch->index); + if (ch->tmu->pdev) { + ced->suspend = sh_tmu_clock_event_suspend; + ced->resume = sh_tmu_clock_event_resume; + } + pr_info("%s ch%u: used for clock events\n", + ch->tmu->name, ch->index); clockevents_config_and_register(ced, ch->tmu->rate, 0x300, 0xffffffff); ret = request_irq(ch->irq, sh_tmu_interrupt, IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING, - dev_name(&ch->tmu->pdev->dev), ch); + ch->tmu->name, ch); if (ret) { - dev_err(&ch->tmu->pdev->dev, "ch%u: failed to request irq %d\n", - ch->index, ch->irq); + pr_err("%s ch%u: failed to request irq %d\n", + ch->tmu->name, ch->index, ch->irq); return; } } static int sh_tmu_register(struct sh_tmu_channel *ch, const char *name, + struct device_node *np, bool clockevent, bool clocksource) { if (clockevent) { ch->tmu->has_clockevent = true; - sh_tmu_register_clockevent(ch, name); + sh_tmu_register_clockevent(ch, name, np); } else if (clocksource) { ch->tmu->has_clocksource = true; sh_tmu_register_clocksource(ch, name); @@ -451,7 +462,8 @@ static int sh_tmu_register(struct sh_tmu_channel *ch, const char *name, static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index, bool clockevent, bool clocksource, - struct sh_tmu_device *tmu) + struct sh_tmu_device *tmu, + struct device_node *np) { /* Skip unused channels. */ if (!clockevent && !clocksource) @@ -465,53 +477,59 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index, else ch->base = tmu->mapbase + 8 + ch->index * 12; - ch->irq = platform_get_irq(tmu->pdev, index); + if (tmu->pdev) + ch->irq = platform_get_irq(tmu->pdev, index); + else + ch->irq = of_irq_get(np, index); if (ch->irq < 0) return ch->irq; ch->cs_enabled = false; ch->enable_count = 0; - return sh_tmu_register(ch, dev_name(&tmu->pdev->dev), + return sh_tmu_register(ch, tmu->name, np, clockevent, clocksource); } -static int sh_tmu_map_memory(struct sh_tmu_device *tmu) +static int sh_tmu_map_memory(struct sh_tmu_device *tmu, struct device_node *np) { struct resource *res; - res = platform_get_resource(tmu->pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&tmu->pdev->dev, "failed to get I/O memory\n"); - return -ENXIO; - } + if (tmu->pdev) { + res = platform_get_resource(tmu->pdev, IORESOURCE_MEM, 0); + if (!res) { + pr_err("sh_tmu failed to get I/O memory\n"); + return -ENXIO; + } + + tmu->mapbase = ioremap(res->start, resource_size(res)); + } else + tmu->mapbase = of_iomap(np, 0); - tmu->mapbase = ioremap(res->start, resource_size(res)); if (tmu->mapbase == NULL) return -ENXIO; return 0; } -static int sh_tmu_parse_dt(struct sh_tmu_device *tmu) +static int sh_tmu_parse_dt(struct sh_tmu_device *tmu, struct device_node *np) { - struct device_node *np = tmu->pdev->dev.of_node; - tmu->model = SH_TMU; tmu->num_channels = 3; of_property_read_u32(np, "#renesas,channels", &tmu->num_channels); if (tmu->num_channels != 2 && tmu->num_channels != 3) { - dev_err(&tmu->pdev->dev, "invalid number of channels %u\n", - tmu->num_channels); + pr_err("%s: invalid number of channels %u\n", + tmu->name, tmu->num_channels); return -EINVAL; } return 0; } -static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) +static int sh_tmu_setup(struct sh_tmu_device *tmu, + struct platform_device *pdev, struct device_node *np) { unsigned int i; int ret; @@ -520,8 +538,13 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) raw_spin_lock_init(&tmu->lock); - if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) { - ret = sh_tmu_parse_dt(tmu); + if (pdev) + tmu->name = dev_name(&pdev->dev); + else + tmu->name = of_node_full_name(np); + + if (IS_ENABLED(CONFIG_OF) && np) { + ret = sh_tmu_parse_dt(tmu, np); if (ret < 0) return ret; } else if (pdev->dev.platform_data) { @@ -531,14 +554,17 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) tmu->model = id->driver_data; tmu->num_channels = hweight8(cfg->channels_mask); } else { - dev_err(&tmu->pdev->dev, "missing platform data\n"); + pr_err("%s missing platform data\n", tmu->name); return -ENXIO; } /* Get hold of clock. */ - tmu->clk = clk_get(&tmu->pdev->dev, "fck"); + if (pdev) + tmu->clk = clk_get(&tmu->pdev->dev, "fck"); + else + tmu->clk = of_clk_get(np, 0); if (IS_ERR(tmu->clk)) { - dev_err(&tmu->pdev->dev, "cannot get clock\n"); + pr_err("%s: cannot get clock\n", tmu->name); return PTR_ERR(tmu->clk); } @@ -555,9 +581,9 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) clk_disable(tmu->clk); /* Map the memory resource. */ - ret = sh_tmu_map_memory(tmu); + ret = sh_tmu_map_memory(tmu, np); if (ret < 0) { - dev_err(&tmu->pdev->dev, "failed to remap I/O memory\n"); + pr_err("%s: failed to remap I/O memory\n", tmu->name); goto err_clk_unprepare; } @@ -575,12 +601,12 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) */ for (i = 0; i < tmu->num_channels; ++i) { ret = sh_tmu_channel_setup(&tmu->channels[i], i, - i == 0, i == 1, tmu); + i == 0, i == 1, tmu, np); if (ret < 0) goto err_unmap; } - - platform_set_drvdata(pdev, tmu); + if (pdev) + platform_set_drvdata(pdev, tmu); return 0; @@ -594,6 +620,7 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev) return ret; } +#ifndef CONFIG_SH_DEVICE_TREE static int sh_tmu_probe(struct platform_device *pdev) { struct sh_tmu_device *tmu = platform_get_drvdata(pdev); @@ -613,7 +640,7 @@ static int sh_tmu_probe(struct platform_device *pdev) if (tmu == NULL) return -ENOMEM; - ret = sh_tmu_setup(tmu, pdev); + ret = sh_tmu_setup(tmu, pdev, pdev->dev.of_node); if (ret) { kfree(tmu); pm_runtime_idle(&pdev->dev); @@ -631,7 +658,26 @@ static int sh_tmu_probe(struct platform_device *pdev) return 0; } +#else +static int __init sh_tmu_of_register(struct device_node *np) +{ + struct sh_tmu_device *tmu; + int ret; + + tmu = kzalloc(sizeof(*tmu), GFP_KERNEL); + if (tmu == NULL) + return -ENOMEM; + + ret = sh_tmu_setup(tmu, NULL, np); + if (ret) { + kfree(tmu); + pr_warn("%pOF: Timer register failed (%d)", np, ret); + } + return ret; +} +#endif +#ifndef CONFIG_SH_DEVICE_TREE static const struct platform_device_id sh_tmu_id_table[] = { { "sh-tmu", SH_TMU }, { "sh-tmu-sh3", SH_TMU_SH3 }, @@ -665,12 +711,17 @@ static void __exit sh_tmu_exit(void) platform_driver_unregister(&sh_tmu_device_driver); } +subsys_initcall(sh_tmu_init); +module_exit(sh_tmu_exit); +#endif + #ifdef CONFIG_SUPERH +#ifdef CONFIG_SH_DEVICE_TREE +TIMER_OF_DECLARE(sh_tmu, "renesas,tmu", sh_tmu_of_register); +#else sh_early_platform_init("earlytimer", &sh_tmu_device_driver); #endif - -subsys_initcall(sh_tmu_init); -module_exit(sh_tmu_exit); +#endif MODULE_AUTHOR("Magnus Damm"); MODULE_DESCRIPTION("SuperH TMU Timer Driver");
Enables registration as a Clocksource in the case of OF. Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp> --- drivers/clocksource/sh_tmu.c | 161 +++++++++++++++++++++++------------ 1 file changed, 106 insertions(+), 55 deletions(-)