Updates for clocksource/clockevent drivers:
- Remove the OXNAS driver instead of adding a new one! - A set of boring fixes, cleanups and improvements -----BEGIN PGP SIGNATURE----- iQJHBAABCgAxFiEEQp8+kY+LLUocC4bMphj1TA10mKEFAmT1ixwTHHRnbHhAbGlu dXRyb25peC5kZQAKCRCmGPVMDXSYoaIAEACUw02RVWQEbsmJCcnyTPAOoP99xphv IPH32UL9Iuq2rgsGOfTGDw8be2bnlUw8d2FEsUtR0lnwfsBDzQKxh+iHWUPzhosX VbhcN/tHC0KXzWL/dKPiCjS2CVRMlSRu39XN2+9typmf0GpK1IQzDHjKj5Z95Vdp Zb1tPm9N18ZSdT04dNRdNlkmdCjjMaPE9h0hpyIqALQD2TmTs9CwO7nxbf7hXJTB 4tLGOW1MznuIAhwLK0toSHmMKv8YTNn9arwDZ6PDDFpff06Q+Gw5YitsgzTFNNIh TlLQdq04DOiXOh47VwiU0Ixc/JdlxN0pxscfYN0KP6Odjs+IkE+cSyhfYNFQTaFc qN4C4j0FpCkFmsIeLpCg9FAU0eqA/ViRR1NR+TIJW9jRYMaJOBD3s9Kehv1Xj5di hOCh0EvU/TFZ2v1ZgSD3RWgIcvGnijKxvw1Rrh+ZTJTX2LnkXRJqQY9PTKfIFNLM LJoo/oXp6aAcpnrxIMvG2splxRihqpuzUpY+Y0SnOQnbgbPeZ3/lx7PMiXrfDIr7 y8npY/2upKLjC5TlbCX42FBTulQfeLWT8TI6yGwPOQudigdyeBDWNV3+lpLMxrJe s/MbARoOM9Nx2toz9qFa+yuKTcJtaSQfwmcwP1jQRei8O+MXkDe7HmfRnp0bMPF3 a5A0B/fdRjEEwQ== =dGVZ -----END PGP SIGNATURE----- Merge tag 'timers-core-2023-09-04-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull clocksource/clockevent driver updates from Thomas Gleixner: - Remove the OXNAS driver instead of adding a new one! - A set of boring fixes, cleanups and improvements * tag 'timers-core-2023-09-04-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: Explicitly include correct DT includes clocksource/drivers/sun5i: Convert to platform device driver clocksource/drivers/sun5i: Remove pointless struct clocksource/drivers/sun5i: Remove duplication of code and data clocksource/drivers/loongson1: Set variable ls1x_timer_lock storage-class-specifier to static clocksource/drivers/arm_arch_timer: Disable timer before programming CVAL dt-bindings: timer: oxsemi,rps-timer: remove obsolete bindings clocksource/drivers/timer-oxnas-rps: Remove obsolete timer driver
This commit is contained in:
Linus Torvalds
Коммит
4accdb9895
|
|
@ -1,17 +0,0 @@
|
|||
Oxford Semiconductor OXNAS SoCs Family RPS Timer
|
||||
================================================
|
||||
|
||||
Required properties:
|
||||
- compatible: Should be "oxsemi,ox810se-rps-timer" or "oxsemi,ox820-rps-timer"
|
||||
- reg : Specifies base physical address and size of the registers.
|
||||
- interrupts : The interrupts of the two timers
|
||||
- clocks : The phandle of the timer clock source
|
||||
|
||||
example:
|
||||
|
||||
timer0: timer@200 {
|
||||
compatible = "oxsemi,ox810se-rps-timer";
|
||||
reg = <0x200 0x40>;
|
||||
clocks = <&rpsclk>;
|
||||
interrupts = <4 5>;
|
||||
};
|
||||
|
|
@ -461,13 +461,6 @@ config VF_PIT_TIMER
|
|||
help
|
||||
Support for Periodic Interrupt Timer on Freescale Vybrid Family SoCs.
|
||||
|
||||
config OXNAS_RPS_TIMER
|
||||
bool "Oxford Semiconductor OXNAS RPS Timers driver" if COMPILE_TEST
|
||||
select TIMER_OF
|
||||
select CLKSRC_MMIO
|
||||
help
|
||||
This enables support for the Oxford Semiconductor OXNAS RPS timers.
|
||||
|
||||
config SYS_SUPPORTS_SH_CMT
|
||||
bool
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ obj-$(CONFIG_MTK_TIMER) += timer-mediatek.o
|
|||
obj-$(CONFIG_MTK_CPUX_TIMER) += timer-mediatek-cpux.o
|
||||
obj-$(CONFIG_CLKSRC_PISTACHIO) += timer-pistachio.o
|
||||
obj-$(CONFIG_CLKSRC_TI_32K) += timer-ti-32k.o
|
||||
obj-$(CONFIG_OXNAS_RPS_TIMER) += timer-oxnas-rps.o
|
||||
obj-$(CONFIG_OWL_TIMER) += timer-owl.o
|
||||
obj-$(CONFIG_MILBEAUT_TIMER) += timer-milbeaut.o
|
||||
obj-$(CONFIG_SPRD_TIMER) += timer-sprd.o
|
||||
|
|
|
|||
|
|
@ -792,6 +792,13 @@ static __always_inline void set_next_event_mem(const int access, unsigned long e
|
|||
u64 cnt;
|
||||
|
||||
ctrl = arch_timer_reg_read(access, ARCH_TIMER_REG_CTRL, clk);
|
||||
|
||||
/* Timer must be disabled before programming CVAL */
|
||||
if (ctrl & ARCH_TIMER_CTRL_ENABLE) {
|
||||
ctrl &= ~ARCH_TIMER_CTRL_ENABLE;
|
||||
arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk);
|
||||
}
|
||||
|
||||
ctrl |= ARCH_TIMER_CTRL_ENABLE;
|
||||
ctrl &= ~ARCH_TIMER_CTRL_IT_MASK;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#define CNTR_WIDTH 24
|
||||
|
||||
DEFINE_RAW_SPINLOCK(ls1x_timer_lock);
|
||||
static DEFINE_RAW_SPINLOCK(ls1x_timer_lock);
|
||||
|
||||
struct ls1x_clocksource {
|
||||
void __iomem *reg_base;
|
||||
|
|
|
|||
|
|
@ -1,288 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* drivers/clocksource/timer-oxnas-rps.c
|
||||
*
|
||||
* Copyright (C) 2009 Oxford Semiconductor Ltd
|
||||
* Copyright (C) 2013 Ma Haijun <mahaijuns@gmail.com>
|
||||
* Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/clockchips.h>
|
||||
#include <linux/sched_clock.h>
|
||||
|
||||
/* TIMER1 used as tick
|
||||
* TIMER2 used as clocksource
|
||||
*/
|
||||
|
||||
/* Registers definitions */
|
||||
|
||||
#define TIMER_LOAD_REG 0x0
|
||||
#define TIMER_CURR_REG 0x4
|
||||
#define TIMER_CTRL_REG 0x8
|
||||
#define TIMER_CLRINT_REG 0xC
|
||||
|
||||
#define TIMER_BITS 24
|
||||
|
||||
#define TIMER_MAX_VAL (BIT(TIMER_BITS) - 1)
|
||||
|
||||
#define TIMER_PERIODIC BIT(6)
|
||||
#define TIMER_ENABLE BIT(7)
|
||||
|
||||
#define TIMER_DIV1 (0)
|
||||
#define TIMER_DIV16 (1 << 2)
|
||||
#define TIMER_DIV256 (2 << 2)
|
||||
|
||||
#define TIMER1_REG_OFFSET 0
|
||||
#define TIMER2_REG_OFFSET 0x20
|
||||
|
||||
/* Clockevent & Clocksource data */
|
||||
|
||||
struct oxnas_rps_timer {
|
||||
struct clock_event_device clkevent;
|
||||
void __iomem *clksrc_base;
|
||||
void __iomem *clkevt_base;
|
||||
unsigned long timer_period;
|
||||
unsigned int timer_prescaler;
|
||||
struct clk *clk;
|
||||
int irq;
|
||||
};
|
||||
|
||||
static irqreturn_t oxnas_rps_timer_irq(int irq, void *dev_id)
|
||||
{
|
||||
struct oxnas_rps_timer *rps = dev_id;
|
||||
|
||||
writel_relaxed(0, rps->clkevt_base + TIMER_CLRINT_REG);
|
||||
|
||||
rps->clkevent.event_handler(&rps->clkevent);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static void oxnas_rps_timer_config(struct oxnas_rps_timer *rps,
|
||||
unsigned long period,
|
||||
unsigned int periodic)
|
||||
{
|
||||
uint32_t cfg = rps->timer_prescaler;
|
||||
|
||||
if (period)
|
||||
cfg |= TIMER_ENABLE;
|
||||
|
||||
if (periodic)
|
||||
cfg |= TIMER_PERIODIC;
|
||||
|
||||
writel_relaxed(period, rps->clkevt_base + TIMER_LOAD_REG);
|
||||
writel_relaxed(cfg, rps->clkevt_base + TIMER_CTRL_REG);
|
||||
}
|
||||
|
||||
static int oxnas_rps_timer_shutdown(struct clock_event_device *evt)
|
||||
{
|
||||
struct oxnas_rps_timer *rps =
|
||||
container_of(evt, struct oxnas_rps_timer, clkevent);
|
||||
|
||||
oxnas_rps_timer_config(rps, 0, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int oxnas_rps_timer_set_periodic(struct clock_event_device *evt)
|
||||
{
|
||||
struct oxnas_rps_timer *rps =
|
||||
container_of(evt, struct oxnas_rps_timer, clkevent);
|
||||
|
||||
oxnas_rps_timer_config(rps, rps->timer_period, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int oxnas_rps_timer_set_oneshot(struct clock_event_device *evt)
|
||||
{
|
||||
struct oxnas_rps_timer *rps =
|
||||
container_of(evt, struct oxnas_rps_timer, clkevent);
|
||||
|
||||
oxnas_rps_timer_config(rps, rps->timer_period, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int oxnas_rps_timer_next_event(unsigned long delta,
|
||||
struct clock_event_device *evt)
|
||||
{
|
||||
struct oxnas_rps_timer *rps =
|
||||
container_of(evt, struct oxnas_rps_timer, clkevent);
|
||||
|
||||
oxnas_rps_timer_config(rps, delta, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __init oxnas_rps_clockevent_init(struct oxnas_rps_timer *rps)
|
||||
{
|
||||
ulong clk_rate = clk_get_rate(rps->clk);
|
||||
ulong timer_rate;
|
||||
|
||||
/* Start with prescaler 1 */
|
||||
rps->timer_prescaler = TIMER_DIV1;
|
||||
rps->timer_period = DIV_ROUND_UP(clk_rate, HZ);
|
||||
timer_rate = clk_rate;
|
||||
|
||||
if (rps->timer_period > TIMER_MAX_VAL) {
|
||||
rps->timer_prescaler = TIMER_DIV16;
|
||||
timer_rate = clk_rate / 16;
|
||||
rps->timer_period = DIV_ROUND_UP(timer_rate, HZ);
|
||||
}
|
||||
if (rps->timer_period > TIMER_MAX_VAL) {
|
||||
rps->timer_prescaler = TIMER_DIV256;
|
||||
timer_rate = clk_rate / 256;
|
||||
rps->timer_period = DIV_ROUND_UP(timer_rate, HZ);
|
||||
}
|
||||
|
||||
rps->clkevent.name = "oxnas-rps";
|
||||
rps->clkevent.features = CLOCK_EVT_FEAT_PERIODIC |
|
||||
CLOCK_EVT_FEAT_ONESHOT |
|
||||
CLOCK_EVT_FEAT_DYNIRQ;
|
||||
rps->clkevent.tick_resume = oxnas_rps_timer_shutdown;
|
||||
rps->clkevent.set_state_shutdown = oxnas_rps_timer_shutdown;
|
||||
rps->clkevent.set_state_periodic = oxnas_rps_timer_set_periodic;
|
||||
rps->clkevent.set_state_oneshot = oxnas_rps_timer_set_oneshot;
|
||||
rps->clkevent.set_next_event = oxnas_rps_timer_next_event;
|
||||
rps->clkevent.rating = 200;
|
||||
rps->clkevent.cpumask = cpu_possible_mask;
|
||||
rps->clkevent.irq = rps->irq;
|
||||
clockevents_config_and_register(&rps->clkevent,
|
||||
timer_rate,
|
||||
1,
|
||||
TIMER_MAX_VAL);
|
||||
|
||||
pr_info("Registered clock event rate %luHz prescaler %x period %lu\n",
|
||||
clk_rate,
|
||||
rps->timer_prescaler,
|
||||
rps->timer_period);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Clocksource */
|
||||
|
||||
static void __iomem *timer_sched_base;
|
||||
|
||||
static u64 notrace oxnas_rps_read_sched_clock(void)
|
||||
{
|
||||
return ~readl_relaxed(timer_sched_base);
|
||||
}
|
||||
|
||||
static int __init oxnas_rps_clocksource_init(struct oxnas_rps_timer *rps)
|
||||
{
|
||||
ulong clk_rate = clk_get_rate(rps->clk);
|
||||
int ret;
|
||||
|
||||
/* use prescale 16 */
|
||||
clk_rate = clk_rate / 16;
|
||||
|
||||
writel_relaxed(TIMER_MAX_VAL, rps->clksrc_base + TIMER_LOAD_REG);
|
||||
writel_relaxed(TIMER_PERIODIC | TIMER_ENABLE | TIMER_DIV16,
|
||||
rps->clksrc_base + TIMER_CTRL_REG);
|
||||
|
||||
timer_sched_base = rps->clksrc_base + TIMER_CURR_REG;
|
||||
sched_clock_register(oxnas_rps_read_sched_clock,
|
||||
TIMER_BITS, clk_rate);
|
||||
ret = clocksource_mmio_init(timer_sched_base,
|
||||
"oxnas_rps_clocksource_timer",
|
||||
clk_rate, 250, TIMER_BITS,
|
||||
clocksource_mmio_readl_down);
|
||||
if (WARN_ON(ret)) {
|
||||
pr_err("can't register clocksource\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
pr_info("Registered clocksource rate %luHz\n", clk_rate);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __init oxnas_rps_timer_init(struct device_node *np)
|
||||
{
|
||||
struct oxnas_rps_timer *rps;
|
||||
void __iomem *base;
|
||||
int ret;
|
||||
|
||||
rps = kzalloc(sizeof(*rps), GFP_KERNEL);
|
||||
if (!rps)
|
||||
return -ENOMEM;
|
||||
|
||||
rps->clk = of_clk_get(np, 0);
|
||||
if (IS_ERR(rps->clk)) {
|
||||
ret = PTR_ERR(rps->clk);
|
||||
goto err_alloc;
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(rps->clk);
|
||||
if (ret)
|
||||
goto err_clk;
|
||||
|
||||
base = of_iomap(np, 0);
|
||||
if (!base) {
|
||||
ret = -ENXIO;
|
||||
goto err_clk_prepare;
|
||||
}
|
||||
|
||||
rps->irq = irq_of_parse_and_map(np, 0);
|
||||
if (!rps->irq) {
|
||||
ret = -EINVAL;
|
||||
goto err_iomap;
|
||||
}
|
||||
|
||||
rps->clkevt_base = base + TIMER1_REG_OFFSET;
|
||||
rps->clksrc_base = base + TIMER2_REG_OFFSET;
|
||||
|
||||
/* Disable timers */
|
||||
writel_relaxed(0, rps->clkevt_base + TIMER_CTRL_REG);
|
||||
writel_relaxed(0, rps->clksrc_base + TIMER_CTRL_REG);
|
||||
writel_relaxed(0, rps->clkevt_base + TIMER_LOAD_REG);
|
||||
writel_relaxed(0, rps->clksrc_base + TIMER_LOAD_REG);
|
||||
writel_relaxed(0, rps->clkevt_base + TIMER_CLRINT_REG);
|
||||
writel_relaxed(0, rps->clksrc_base + TIMER_CLRINT_REG);
|
||||
|
||||
ret = request_irq(rps->irq, oxnas_rps_timer_irq,
|
||||
IRQF_TIMER | IRQF_IRQPOLL,
|
||||
"rps-timer", rps);
|
||||
if (ret)
|
||||
goto err_iomap;
|
||||
|
||||
ret = oxnas_rps_clocksource_init(rps);
|
||||
if (ret)
|
||||
goto err_irqreq;
|
||||
|
||||
ret = oxnas_rps_clockevent_init(rps);
|
||||
if (ret)
|
||||
goto err_irqreq;
|
||||
|
||||
return 0;
|
||||
|
||||
err_irqreq:
|
||||
free_irq(rps->irq, rps);
|
||||
err_iomap:
|
||||
iounmap(base);
|
||||
err_clk_prepare:
|
||||
clk_disable_unprepare(rps->clk);
|
||||
err_clk:
|
||||
clk_put(rps->clk);
|
||||
err_alloc:
|
||||
kfree(rps);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
TIMER_OF_DECLARE(ox810se_rps,
|
||||
"oxsemi,ox810se-rps-timer", oxnas_rps_timer_init);
|
||||
TIMER_OF_DECLARE(ox820_rps,
|
||||
"oxsemi,ox820-rps-timer", oxnas_rps_timer_init);
|
||||
|
|
@ -16,9 +16,7 @@
|
|||
#include <linux/irqreturn.h>
|
||||
#include <linux/reset.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#define TIMER_IRQ_EN_REG 0x00
|
||||
#define TIMER_IRQ_EN(val) BIT(val)
|
||||
|
|
@ -40,26 +38,16 @@ struct sun5i_timer {
|
|||
struct clk *clk;
|
||||
struct notifier_block clk_rate_cb;
|
||||
u32 ticks_per_jiffy;
|
||||
};
|
||||
|
||||
#define to_sun5i_timer(x) \
|
||||
container_of(x, struct sun5i_timer, clk_rate_cb)
|
||||
|
||||
struct sun5i_timer_clksrc {
|
||||
struct sun5i_timer timer;
|
||||
struct clocksource clksrc;
|
||||
};
|
||||
|
||||
#define to_sun5i_timer_clksrc(x) \
|
||||
container_of(x, struct sun5i_timer_clksrc, clksrc)
|
||||
|
||||
struct sun5i_timer_clkevt {
|
||||
struct sun5i_timer timer;
|
||||
struct clock_event_device clkevt;
|
||||
};
|
||||
|
||||
#define to_sun5i_timer_clkevt(x) \
|
||||
container_of(x, struct sun5i_timer_clkevt, clkevt)
|
||||
#define nb_to_sun5i_timer(x) \
|
||||
container_of(x, struct sun5i_timer, clk_rate_cb)
|
||||
#define clksrc_to_sun5i_timer(x) \
|
||||
container_of(x, struct sun5i_timer, clksrc)
|
||||
#define clkevt_to_sun5i_timer(x) \
|
||||
container_of(x, struct sun5i_timer, clkevt)
|
||||
|
||||
/*
|
||||
* When we disable a timer, we need to wait at least for 2 cycles of
|
||||
|
|
@ -67,30 +55,30 @@ struct sun5i_timer_clkevt {
|
|||
* that is already setup and runs at the same frequency than the other
|
||||
* timers, and we never will be disabled.
|
||||
*/
|
||||
static void sun5i_clkevt_sync(struct sun5i_timer_clkevt *ce)
|
||||
static void sun5i_clkevt_sync(struct sun5i_timer *ce)
|
||||
{
|
||||
u32 old = readl(ce->timer.base + TIMER_CNTVAL_LO_REG(1));
|
||||
u32 old = readl(ce->base + TIMER_CNTVAL_LO_REG(1));
|
||||
|
||||
while ((old - readl(ce->timer.base + TIMER_CNTVAL_LO_REG(1))) < TIMER_SYNC_TICKS)
|
||||
while ((old - readl(ce->base + TIMER_CNTVAL_LO_REG(1))) < TIMER_SYNC_TICKS)
|
||||
cpu_relax();
|
||||
}
|
||||
|
||||
static void sun5i_clkevt_time_stop(struct sun5i_timer_clkevt *ce, u8 timer)
|
||||
static void sun5i_clkevt_time_stop(struct sun5i_timer *ce, u8 timer)
|
||||
{
|
||||
u32 val = readl(ce->timer.base + TIMER_CTL_REG(timer));
|
||||
writel(val & ~TIMER_CTL_ENABLE, ce->timer.base + TIMER_CTL_REG(timer));
|
||||
u32 val = readl(ce->base + TIMER_CTL_REG(timer));
|
||||
writel(val & ~TIMER_CTL_ENABLE, ce->base + TIMER_CTL_REG(timer));
|
||||
|
||||
sun5i_clkevt_sync(ce);
|
||||
}
|
||||
|
||||
static void sun5i_clkevt_time_setup(struct sun5i_timer_clkevt *ce, u8 timer, u32 delay)
|
||||
static void sun5i_clkevt_time_setup(struct sun5i_timer *ce, u8 timer, u32 delay)
|
||||
{
|
||||
writel(delay, ce->timer.base + TIMER_INTVAL_LO_REG(timer));
|
||||
writel(delay, ce->base + TIMER_INTVAL_LO_REG(timer));
|
||||
}
|
||||
|
||||
static void sun5i_clkevt_time_start(struct sun5i_timer_clkevt *ce, u8 timer, bool periodic)
|
||||
static void sun5i_clkevt_time_start(struct sun5i_timer *ce, u8 timer, bool periodic)
|
||||
{
|
||||
u32 val = readl(ce->timer.base + TIMER_CTL_REG(timer));
|
||||
u32 val = readl(ce->base + TIMER_CTL_REG(timer));
|
||||
|
||||
if (periodic)
|
||||
val &= ~TIMER_CTL_ONESHOT;
|
||||
|
|
@ -98,12 +86,12 @@ static void sun5i_clkevt_time_start(struct sun5i_timer_clkevt *ce, u8 timer, boo
|
|||
val |= TIMER_CTL_ONESHOT;
|
||||
|
||||
writel(val | TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
|
||||
ce->timer.base + TIMER_CTL_REG(timer));
|
||||
ce->base + TIMER_CTL_REG(timer));
|
||||
}
|
||||
|
||||
static int sun5i_clkevt_shutdown(struct clock_event_device *clkevt)
|
||||
{
|
||||
struct sun5i_timer_clkevt *ce = to_sun5i_timer_clkevt(clkevt);
|
||||
struct sun5i_timer *ce = clkevt_to_sun5i_timer(clkevt);
|
||||
|
||||
sun5i_clkevt_time_stop(ce, 0);
|
||||
return 0;
|
||||
|
|
@ -111,7 +99,7 @@ static int sun5i_clkevt_shutdown(struct clock_event_device *clkevt)
|
|||
|
||||
static int sun5i_clkevt_set_oneshot(struct clock_event_device *clkevt)
|
||||
{
|
||||
struct sun5i_timer_clkevt *ce = to_sun5i_timer_clkevt(clkevt);
|
||||
struct sun5i_timer *ce = clkevt_to_sun5i_timer(clkevt);
|
||||
|
||||
sun5i_clkevt_time_stop(ce, 0);
|
||||
sun5i_clkevt_time_start(ce, 0, false);
|
||||
|
|
@ -120,10 +108,10 @@ static int sun5i_clkevt_set_oneshot(struct clock_event_device *clkevt)
|
|||
|
||||
static int sun5i_clkevt_set_periodic(struct clock_event_device *clkevt)
|
||||
{
|
||||
struct sun5i_timer_clkevt *ce = to_sun5i_timer_clkevt(clkevt);
|
||||
struct sun5i_timer *ce = clkevt_to_sun5i_timer(clkevt);
|
||||
|
||||
sun5i_clkevt_time_stop(ce, 0);
|
||||
sun5i_clkevt_time_setup(ce, 0, ce->timer.ticks_per_jiffy);
|
||||
sun5i_clkevt_time_setup(ce, 0, ce->ticks_per_jiffy);
|
||||
sun5i_clkevt_time_start(ce, 0, true);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -131,7 +119,7 @@ static int sun5i_clkevt_set_periodic(struct clock_event_device *clkevt)
|
|||
static int sun5i_clkevt_next_event(unsigned long evt,
|
||||
struct clock_event_device *clkevt)
|
||||
{
|
||||
struct sun5i_timer_clkevt *ce = to_sun5i_timer_clkevt(clkevt);
|
||||
struct sun5i_timer *ce = clkevt_to_sun5i_timer(clkevt);
|
||||
|
||||
sun5i_clkevt_time_stop(ce, 0);
|
||||
sun5i_clkevt_time_setup(ce, 0, evt - TIMER_SYNC_TICKS);
|
||||
|
|
@ -142,9 +130,9 @@ static int sun5i_clkevt_next_event(unsigned long evt,
|
|||
|
||||
static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct sun5i_timer_clkevt *ce = dev_id;
|
||||
struct sun5i_timer *ce = dev_id;
|
||||
|
||||
writel(0x1, ce->timer.base + TIMER_IRQ_ST_REG);
|
||||
writel(0x1, ce->base + TIMER_IRQ_ST_REG);
|
||||
ce->clkevt.event_handler(&ce->clkevt);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
|
|
@ -152,17 +140,16 @@ static irqreturn_t sun5i_timer_interrupt(int irq, void *dev_id)
|
|||
|
||||
static u64 sun5i_clksrc_read(struct clocksource *clksrc)
|
||||
{
|
||||
struct sun5i_timer_clksrc *cs = to_sun5i_timer_clksrc(clksrc);
|
||||
struct sun5i_timer *cs = clksrc_to_sun5i_timer(clksrc);
|
||||
|
||||
return ~readl(cs->timer.base + TIMER_CNTVAL_LO_REG(1));
|
||||
return ~readl(cs->base + TIMER_CNTVAL_LO_REG(1));
|
||||
}
|
||||
|
||||
static int sun5i_rate_cb_clksrc(struct notifier_block *nb,
|
||||
unsigned long event, void *data)
|
||||
static int sun5i_rate_cb(struct notifier_block *nb,
|
||||
unsigned long event, void *data)
|
||||
{
|
||||
struct clk_notifier_data *ndata = data;
|
||||
struct sun5i_timer *timer = to_sun5i_timer(nb);
|
||||
struct sun5i_timer_clksrc *cs = container_of(timer, struct sun5i_timer_clksrc, timer);
|
||||
struct sun5i_timer *cs = nb_to_sun5i_timer(nb);
|
||||
|
||||
switch (event) {
|
||||
case PRE_RATE_CHANGE:
|
||||
|
|
@ -171,6 +158,8 @@ static int sun5i_rate_cb_clksrc(struct notifier_block *nb,
|
|||
|
||||
case POST_RATE_CHANGE:
|
||||
clocksource_register_hz(&cs->clksrc, ndata->new_rate);
|
||||
clockevents_update_freq(&cs->clkevt, ndata->new_rate);
|
||||
cs->ticks_per_jiffy = DIV_ROUND_UP(ndata->new_rate, HZ);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -180,47 +169,18 @@ static int sun5i_rate_cb_clksrc(struct notifier_block *nb,
|
|||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
static int __init sun5i_setup_clocksource(struct device_node *node,
|
||||
void __iomem *base,
|
||||
struct clk *clk, int irq)
|
||||
static int sun5i_setup_clocksource(struct platform_device *pdev,
|
||||
unsigned long rate)
|
||||
{
|
||||
struct sun5i_timer_clksrc *cs;
|
||||
unsigned long rate;
|
||||
struct sun5i_timer *cs = platform_get_drvdata(pdev);
|
||||
void __iomem *base = cs->base;
|
||||
int ret;
|
||||
|
||||
cs = kzalloc(sizeof(*cs), GFP_KERNEL);
|
||||
if (!cs)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = clk_prepare_enable(clk);
|
||||
if (ret) {
|
||||
pr_err("Couldn't enable parent clock\n");
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
rate = clk_get_rate(clk);
|
||||
if (!rate) {
|
||||
pr_err("Couldn't get parent clock rate\n");
|
||||
ret = -EINVAL;
|
||||
goto err_disable_clk;
|
||||
}
|
||||
|
||||
cs->timer.base = base;
|
||||
cs->timer.clk = clk;
|
||||
cs->timer.clk_rate_cb.notifier_call = sun5i_rate_cb_clksrc;
|
||||
cs->timer.clk_rate_cb.next = NULL;
|
||||
|
||||
ret = clk_notifier_register(clk, &cs->timer.clk_rate_cb);
|
||||
if (ret) {
|
||||
pr_err("Unable to register clock notifier.\n");
|
||||
goto err_disable_clk;
|
||||
}
|
||||
|
||||
writel(~0, base + TIMER_INTVAL_LO_REG(1));
|
||||
writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
|
||||
base + TIMER_CTL_REG(1));
|
||||
|
||||
cs->clksrc.name = node->name;
|
||||
cs->clksrc.name = pdev->dev.of_node->name;
|
||||
cs->clksrc.rating = 340;
|
||||
cs->clksrc.read = sun5i_clksrc_read;
|
||||
cs->clksrc.mask = CLOCKSOURCE_MASK(32);
|
||||
|
|
@ -228,74 +188,23 @@ static int __init sun5i_setup_clocksource(struct device_node *node,
|
|||
|
||||
ret = clocksource_register_hz(&cs->clksrc, rate);
|
||||
if (ret) {
|
||||
pr_err("Couldn't register clock source.\n");
|
||||
goto err_remove_notifier;
|
||||
dev_err(&pdev->dev, "Couldn't register clock source.\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_remove_notifier:
|
||||
clk_notifier_unregister(clk, &cs->timer.clk_rate_cb);
|
||||
err_disable_clk:
|
||||
clk_disable_unprepare(clk);
|
||||
err_free:
|
||||
kfree(cs);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int sun5i_rate_cb_clkevt(struct notifier_block *nb,
|
||||
unsigned long event, void *data)
|
||||
static int sun5i_setup_clockevent(struct platform_device *pdev,
|
||||
unsigned long rate, int irq)
|
||||
{
|
||||
struct clk_notifier_data *ndata = data;
|
||||
struct sun5i_timer *timer = to_sun5i_timer(nb);
|
||||
struct sun5i_timer_clkevt *ce = container_of(timer, struct sun5i_timer_clkevt, timer);
|
||||
|
||||
if (event == POST_RATE_CHANGE) {
|
||||
clockevents_update_freq(&ce->clkevt, ndata->new_rate);
|
||||
ce->timer.ticks_per_jiffy = DIV_ROUND_UP(ndata->new_rate, HZ);
|
||||
}
|
||||
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
static int __init sun5i_setup_clockevent(struct device_node *node, void __iomem *base,
|
||||
struct clk *clk, int irq)
|
||||
{
|
||||
struct sun5i_timer_clkevt *ce;
|
||||
unsigned long rate;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct sun5i_timer *ce = platform_get_drvdata(pdev);
|
||||
void __iomem *base = ce->base;
|
||||
int ret;
|
||||
u32 val;
|
||||
|
||||
ce = kzalloc(sizeof(*ce), GFP_KERNEL);
|
||||
if (!ce)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = clk_prepare_enable(clk);
|
||||
if (ret) {
|
||||
pr_err("Couldn't enable parent clock\n");
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
rate = clk_get_rate(clk);
|
||||
if (!rate) {
|
||||
pr_err("Couldn't get parent clock rate\n");
|
||||
ret = -EINVAL;
|
||||
goto err_disable_clk;
|
||||
}
|
||||
|
||||
ce->timer.base = base;
|
||||
ce->timer.ticks_per_jiffy = DIV_ROUND_UP(rate, HZ);
|
||||
ce->timer.clk = clk;
|
||||
ce->timer.clk_rate_cb.notifier_call = sun5i_rate_cb_clkevt;
|
||||
ce->timer.clk_rate_cb.next = NULL;
|
||||
|
||||
ret = clk_notifier_register(clk, &ce->timer.clk_rate_cb);
|
||||
if (ret) {
|
||||
pr_err("Unable to register clock notifier.\n");
|
||||
goto err_disable_clk;
|
||||
}
|
||||
|
||||
ce->clkevt.name = node->name;
|
||||
ce->clkevt.name = dev->of_node->name;
|
||||
ce->clkevt.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
|
||||
ce->clkevt.set_next_event = sun5i_clkevt_next_event;
|
||||
ce->clkevt.set_state_shutdown = sun5i_clkevt_shutdown;
|
||||
|
|
@ -313,60 +222,109 @@ static int __init sun5i_setup_clockevent(struct device_node *node, void __iomem
|
|||
clockevents_config_and_register(&ce->clkevt, rate,
|
||||
TIMER_SYNC_TICKS, 0xffffffff);
|
||||
|
||||
ret = request_irq(irq, sun5i_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL,
|
||||
"sun5i_timer0", ce);
|
||||
ret = devm_request_irq(dev, irq, sun5i_timer_interrupt,
|
||||
IRQF_TIMER | IRQF_IRQPOLL,
|
||||
"sun5i_timer0", ce);
|
||||
if (ret) {
|
||||
pr_err("Unable to register interrupt\n");
|
||||
goto err_remove_notifier;
|
||||
dev_err(dev, "Unable to register interrupt\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_remove_notifier:
|
||||
clk_notifier_unregister(clk, &ce->timer.clk_rate_cb);
|
||||
err_disable_clk:
|
||||
clk_disable_unprepare(clk);
|
||||
err_free:
|
||||
kfree(ce);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __init sun5i_timer_init(struct device_node *node)
|
||||
static int sun5i_timer_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct sun5i_timer *st;
|
||||
struct reset_control *rstc;
|
||||
void __iomem *timer_base;
|
||||
struct clk *clk;
|
||||
unsigned long rate;
|
||||
int irq, ret;
|
||||
|
||||
timer_base = of_io_request_and_map(node, 0, of_node_full_name(node));
|
||||
st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL);
|
||||
if (!st)
|
||||
return -ENOMEM;
|
||||
|
||||
platform_set_drvdata(pdev, st);
|
||||
|
||||
timer_base = devm_platform_ioremap_resource(pdev, 0);
|
||||
if (IS_ERR(timer_base)) {
|
||||
pr_err("Can't map registers\n");
|
||||
dev_err(dev, "Can't map registers\n");
|
||||
return PTR_ERR(timer_base);
|
||||
}
|
||||
|
||||
irq = irq_of_parse_and_map(node, 0);
|
||||
if (irq <= 0) {
|
||||
pr_err("Can't parse IRQ\n");
|
||||
return -EINVAL;
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "Can't get IRQ\n");
|
||||
return irq;
|
||||
}
|
||||
|
||||
clk = of_clk_get(node, 0);
|
||||
clk = devm_clk_get_enabled(dev, NULL);
|
||||
if (IS_ERR(clk)) {
|
||||
pr_err("Can't get timer clock\n");
|
||||
dev_err(dev, "Can't get timer clock\n");
|
||||
return PTR_ERR(clk);
|
||||
}
|
||||
|
||||
rstc = of_reset_control_get(node, NULL);
|
||||
if (!IS_ERR(rstc))
|
||||
rate = clk_get_rate(clk);
|
||||
if (!rate) {
|
||||
dev_err(dev, "Couldn't get parent clock rate\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
st->base = timer_base;
|
||||
st->ticks_per_jiffy = DIV_ROUND_UP(rate, HZ);
|
||||
st->clk = clk;
|
||||
st->clk_rate_cb.notifier_call = sun5i_rate_cb;
|
||||
st->clk_rate_cb.next = NULL;
|
||||
|
||||
ret = devm_clk_notifier_register(dev, clk, &st->clk_rate_cb);
|
||||
if (ret) {
|
||||
dev_err(dev, "Unable to register clock notifier.\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
rstc = devm_reset_control_get_optional_exclusive(dev, NULL);
|
||||
if (rstc)
|
||||
reset_control_deassert(rstc);
|
||||
|
||||
ret = sun5i_setup_clocksource(node, timer_base, clk, irq);
|
||||
ret = sun5i_setup_clocksource(pdev, rate);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return sun5i_setup_clockevent(node, timer_base, clk, irq);
|
||||
ret = sun5i_setup_clockevent(pdev, rate, irq);
|
||||
if (ret)
|
||||
goto err_unreg_clocksource;
|
||||
|
||||
return 0;
|
||||
|
||||
err_unreg_clocksource:
|
||||
clocksource_unregister(&st->clksrc);
|
||||
return ret;
|
||||
}
|
||||
TIMER_OF_DECLARE(sun5i_a13, "allwinner,sun5i-a13-hstimer",
|
||||
sun5i_timer_init);
|
||||
TIMER_OF_DECLARE(sun7i_a20, "allwinner,sun7i-a20-hstimer",
|
||||
sun5i_timer_init);
|
||||
|
||||
static void sun5i_timer_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct sun5i_timer *st = platform_get_drvdata(pdev);
|
||||
|
||||
clocksource_unregister(&st->clksrc);
|
||||
}
|
||||
|
||||
static const struct of_device_id sun5i_timer_of_match[] = {
|
||||
{ .compatible = "allwinner,sun5i-a13-hstimer" },
|
||||
{ .compatible = "allwinner,sun7i-a20-hstimer" },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, sun5i_timer_of_match);
|
||||
|
||||
static struct platform_driver sun5i_timer_driver = {
|
||||
.probe = sun5i_timer_probe,
|
||||
.remove_new = sun5i_timer_remove,
|
||||
.driver = {
|
||||
.name = "sun5i-timer",
|
||||
.of_match_table = sun5i_timer_of_match,
|
||||
.suppress_bind_attrs = true,
|
||||
},
|
||||
};
|
||||
module_platform_driver(sun5i_timer_driver);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче