Skip to content

L
linux
Commit 56d52d3f authored by Stanley Chu's avatar Stanley Chu Committed by Daniel Lezcano
Browse files
Options

clocksource/drivers/timer-mediatek: Use specific prefix for GPT 

Use specific prefix to specify the name of supported
timer hardware: "General Purpose Timer (GPT)".
Signed-off-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 7ec58e52
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 77 deletions
drivers/clocksource/timer-mediatek.c
View file @ 56d52d3f
...@@ -29,32 +29,35 @@ ...@@ -29,32 +29,35 @@
#include <linux/sched_clock.h> #include <linux/sched_clock.h>
#include <linux/slab.h> #include <linux/slab.h>
#define TIMER_CLK_EVT (1)
#define TIMER_CLK_SRC (2)
#define TIMER_SYNC_TICKS (3)
/* gpt */
#define GPT_IRQ_EN_REG 0x00 #define GPT_IRQ_EN_REG 0x00
#define GPT_IRQ_ENABLE(val) BIT((val) - 1) #define GPT_IRQ_ENABLE(val) BIT((val) - 1)
#define GPT_IRQ_ACK_REG 0x08 #define GPT_IRQ_ACK_REG 0x08
#define GPT_IRQ_ACK(val) BIT((val) - 1) #define GPT_IRQ_ACK(val) BIT((val) - 1)
#define TIMER_CTRL_REG(val) (0x10 * (val)) #define GPT_CTRL_REG(val) (0x10 * (val))
#define TIMER_CTRL_OP(val) (((val) & 0x3) << 4) #define GPT_CTRL_OP(val) (((val) & 0x3) << 4)
#define TIMER_CTRL_OP_ONESHOT (0) #define GPT_CTRL_OP_ONESHOT (0)
#define TIMER_CTRL_OP_REPEAT (1) #define GPT_CTRL_OP_REPEAT (1)
#define TIMER_CTRL_OP_FREERUN (3) #define GPT_CTRL_OP_FREERUN (3)
#define TIMER_CTRL_CLEAR (2) #define GPT_CTRL_CLEAR (2)
#define TIMER_CTRL_ENABLE (1) #define GPT_CTRL_ENABLE (1)
#define TIMER_CTRL_DISABLE (0) #define GPT_CTRL_DISABLE (0)
#define TIMER_CLK_REG(val) (0x04 + (0x10 * (val))) #define GPT_CLK_REG(val) (0x04 + (0x10 * (val)))
#define TIMER_CLK_SRC(val) (((val) & 0x1) << 4) #define GPT_CLK_SRC(val) (((val) & 0x1) << 4)
#define TIMER_CLK_SRC_SYS13M (0) #define GPT_CLK_SRC_SYS13M (0)
#define TIMER_CLK_SRC_RTC32K (1) #define GPT_CLK_SRC_RTC32K (1)
#define TIMER_CLK_DIV1 (0x0) #define GPT_CLK_DIV1 (0x0)
#define TIMER_CLK_DIV2 (0x1) #define GPT_CLK_DIV2 (0x1)
#define TIMER_CNT_REG(val) (0x08 + (0x10 * (val))) #define GPT_CNT_REG(val) (0x08 + (0x10 * (val)))
#define TIMER_CMP_REG(val) (0x0C + (0x10 * (val))) #define GPT_CMP_REG(val) (0x0C + (0x10 * (val)))
#define GPT_CLK_EVT 1
#define GPT_CLK_SRC 2
struct mtk_clock_event_device { struct mtk_clock_event_device {
void __iomem *gpt_base; void __iomem *gpt_base;
...@@ -64,7 +67,7 @@ struct mtk_clock_event_device { ...@@ -64,7 +67,7 @@ struct mtk_clock_event_device {
static void __iomem *gpt_sched_reg __read_mostly; static void __iomem *gpt_sched_reg __read_mostly;
static u64 notrace mtk_read_sched_clock(void) static u64 notrace mtk_gpt_read_sched_clock(void)
{ {
return readl_relaxed(gpt_sched_reg); return readl_relaxed(gpt_sched_reg);
} }
...@@ -75,22 +78,22 @@ static inline struct mtk_clock_event_device *to_mtk_clk( ...@@ -75,22 +78,22 @@ static inline struct mtk_clock_event_device *to_mtk_clk(
return container_of(c, struct mtk_clock_event_device, dev); return container_of(c, struct mtk_clock_event_device, dev);
} }
static void mtk_clkevt_time_stop(struct mtk_clock_event_device *evt, u8 timer) static void mtk_gpt_clkevt_time_stop(struct mtk_clock_event_device *evt, u8 timer)
{ {
u32 val; u32 val;
val = readl(evt->gpt_base + TIMER_CTRL_REG(timer)); val = readl(evt->gpt_base + GPT_CTRL_REG(timer));
writel(val & ~TIMER_CTRL_ENABLE, evt->gpt_base + writel(val & ~GPT_CTRL_ENABLE, evt->gpt_base +
TIMER_CTRL_REG(timer)); GPT_CTRL_REG(timer));
} }
static void mtk_clkevt_time_setup(struct mtk_clock_event_device *evt, static void mtk_gpt_clkevt_time_setup(struct mtk_clock_event_device *evt,
unsigned long delay, u8 timer) unsigned long delay, u8 timer)
{ {
writel(delay, evt->gpt_base + TIMER_CMP_REG(timer)); writel(delay, evt->gpt_base + GPT_CMP_REG(timer));
} }
static void mtk_clkevt_time_start(struct mtk_clock_event_device *evt, static void mtk_gpt_clkevt_time_start(struct mtk_clock_event_device *evt,
bool periodic, u8 timer) bool periodic, u8 timer)
{ {
u32 val; u32 val;
...@@ -98,75 +101,75 @@ static void mtk_clkevt_time_start(struct mtk_clock_event_device *evt, ...@@ -98,75 +101,75 @@ static void mtk_clkevt_time_start(struct mtk_clock_event_device *evt,
/* Acknowledge interrupt */ /* Acknowledge interrupt */
writel(GPT_IRQ_ACK(timer), evt->gpt_base + GPT_IRQ_ACK_REG); writel(GPT_IRQ_ACK(timer), evt->gpt_base + GPT_IRQ_ACK_REG);
val = readl(evt->gpt_base + TIMER_CTRL_REG(timer)); val = readl(evt->gpt_base + GPT_CTRL_REG(timer));
/* Clear 2 bit timer operation mode field */ /* Clear 2 bit timer operation mode field */
val &= ~TIMER_CTRL_OP(0x3); val &= ~GPT_CTRL_OP(0x3);
if (periodic) if (periodic)
val |= TIMER_CTRL_OP(TIMER_CTRL_OP_REPEAT); val |= GPT_CTRL_OP(GPT_CTRL_OP_REPEAT);
else else
val |= TIMER_CTRL_OP(TIMER_CTRL_OP_ONESHOT); val |= GPT_CTRL_OP(GPT_CTRL_OP_ONESHOT);
writel(val | TIMER_CTRL_ENABLE | TIMER_CTRL_CLEAR, writel(val | GPT_CTRL_ENABLE | GPT_CTRL_CLEAR,
evt->gpt_base + TIMER_CTRL_REG(timer)); evt->gpt_base + GPT_CTRL_REG(timer));
} }
static int mtk_clkevt_shutdown(struct clock_event_device *clk) static int mtk_gpt_clkevt_shutdown(struct clock_event_device *clk)
{ {
mtk_clkevt_time_stop(to_mtk_clk(clk), GPT_CLK_EVT); mtk_gpt_clkevt_time_stop(to_mtk_clk(clk), TIMER_CLK_EVT);
return 0; return 0;
} }
static int mtk_clkevt_set_periodic(struct clock_event_device *clk) static int mtk_gpt_clkevt_set_periodic(struct clock_event_device *clk)
{ {
struct mtk_clock_event_device *evt = to_mtk_clk(clk); struct mtk_clock_event_device *evt = to_mtk_clk(clk);
mtk_clkevt_time_stop(evt, GPT_CLK_EVT); mtk_gpt_clkevt_time_stop(evt, TIMER_CLK_EVT);
mtk_clkevt_time_setup(evt, evt->ticks_per_jiffy, GPT_CLK_EVT); mtk_gpt_clkevt_time_setup(evt, evt->ticks_per_jiffy, TIMER_CLK_EVT);
mtk_clkevt_time_start(evt, true, GPT_CLK_EVT); mtk_gpt_clkevt_time_start(evt, true, TIMER_CLK_EVT);
return 0; return 0;
} }
static int mtk_clkevt_next_event(unsigned long event, static int mtk_gpt_clkevt_next_event(unsigned long event,
struct clock_event_device *clk) struct clock_event_device *clk)
{ {
struct mtk_clock_event_device *evt = to_mtk_clk(clk); struct mtk_clock_event_device *evt = to_mtk_clk(clk);
mtk_clkevt_time_stop(evt, GPT_CLK_EVT); mtk_gpt_clkevt_time_stop(evt, TIMER_CLK_EVT);
mtk_clkevt_time_setup(evt, event, GPT_CLK_EVT); mtk_gpt_clkevt_time_setup(evt, event, TIMER_CLK_EVT);
mtk_clkevt_time_start(evt, false, GPT_CLK_EVT); mtk_gpt_clkevt_time_start(evt, false, TIMER_CLK_EVT);
return 0; return 0;
} }
static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id) static irqreturn_t mtk_gpt_interrupt(int irq, void *dev_id)
{ {
struct mtk_clock_event_device *evt = dev_id; struct mtk_clock_event_device *evt = dev_id;
/* Acknowledge timer0 irq */ /* Acknowledge timer0 irq */
writel(GPT_IRQ_ACK(GPT_CLK_EVT), evt->gpt_base + GPT_IRQ_ACK_REG); writel(GPT_IRQ_ACK(TIMER_CLK_EVT), evt->gpt_base + GPT_IRQ_ACK_REG);
evt->dev.event_handler(&evt->dev); evt->dev.event_handler(&evt->dev);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void static void
__init mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option) __init mtk_gpt_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
{ {
writel(TIMER_CTRL_CLEAR | TIMER_CTRL_DISABLE, writel(GPT_CTRL_CLEAR | GPT_CTRL_DISABLE,
evt->gpt_base + TIMER_CTRL_REG(timer)); evt->gpt_base + GPT_CTRL_REG(timer));
writel(TIMER_CLK_SRC(TIMER_CLK_SRC_SYS13M) | TIMER_CLK_DIV1, writel(GPT_CLK_SRC(GPT_CLK_SRC_SYS13M) | GPT_CLK_DIV1,
evt->gpt_base + TIMER_CLK_REG(timer)); evt->gpt_base + GPT_CLK_REG(timer));
writel(0x0, evt->gpt_base + TIMER_CMP_REG(timer)); writel(0x0, evt->gpt_base + GPT_CMP_REG(timer));
writel(TIMER_CTRL_OP(option) | TIMER_CTRL_ENABLE, writel(GPT_CTRL_OP(option) | GPT_CTRL_ENABLE,
evt->gpt_base + TIMER_CTRL_REG(timer)); evt->gpt_base + GPT_CTRL_REG(timer));
} }
static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer) static void mtk_gpt_enable_irq(struct mtk_clock_event_device *evt, u8 timer)
{ {
u32 val; u32 val;
...@@ -181,7 +184,7 @@ static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer) ...@@ -181,7 +184,7 @@ static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer)
evt->gpt_base + GPT_IRQ_EN_REG); evt->gpt_base + GPT_IRQ_EN_REG);
} }
static int __init mtk_timer_init(struct device_node *node) static int __init mtk_gpt_init(struct device_node *node)
{ {
struct mtk_clock_event_device *evt; struct mtk_clock_event_device *evt;
struct resource res; struct resource res;
...@@ -195,14 +198,14 @@ static int __init mtk_timer_init(struct device_node *node) ...@@ -195,14 +198,14 @@ static int __init mtk_timer_init(struct device_node *node)
evt->dev.name = "mtk_tick"; evt->dev.name = "mtk_tick";
evt->dev.rating = 300; evt->dev.rating = 300;
evt->dev.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; evt->dev.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
evt->dev.set_state_shutdown = mtk_clkevt_shutdown; evt->dev.set_state_shutdown = mtk_gpt_clkevt_shutdown;
evt->dev.set_state_periodic = mtk_clkevt_set_periodic; evt->dev.set_state_periodic = mtk_gpt_clkevt_set_periodic;
evt->dev.set_state_oneshot = mtk_clkevt_shutdown; evt->dev.set_state_oneshot = mtk_gpt_clkevt_shutdown;
evt->dev.tick_resume = mtk_clkevt_shutdown; evt->dev.tick_resume = mtk_gpt_clkevt_shutdown;
evt->dev.set_next_event = mtk_clkevt_next_event; evt->dev.set_next_event = mtk_gpt_clkevt_next_event;
evt->dev.cpumask = cpu_possible_mask; evt->dev.cpumask = cpu_possible_mask;
evt->gpt_base = of_io_request_and_map(node, 0, "mtk-timer"); evt->gpt_base = of_io_request_and_map(node, 0, "mtk-timer-gpt");
if (IS_ERR(evt->gpt_base)) { if (IS_ERR(evt->gpt_base)) {
pr_err("Can't get resource\n"); pr_err("Can't get resource\n");
goto err_kzalloc; goto err_kzalloc;
...@@ -226,7 +229,7 @@ static int __init mtk_timer_init(struct device_node *node) ...@@ -226,7 +229,7 @@ static int __init mtk_timer_init(struct device_node *node)
} }
rate = clk_get_rate(clk); rate = clk_get_rate(clk);
if (request_irq(evt->dev.irq, mtk_timer_interrupt, if (request_irq(evt->dev.irq, mtk_gpt_interrupt,
IRQF_TIMER | IRQF_IRQPOLL, "mtk_timer", evt)) { IRQF_TIMER | IRQF_IRQPOLL, "mtk_timer", evt)) {
pr_err("failed to setup irq %d\n", evt->dev.irq); pr_err("failed to setup irq %d\n", evt->dev.irq);
goto err_clk_disable; goto err_clk_disable;
...@@ -235,18 +238,18 @@ static int __init mtk_timer_init(struct device_node *node) ...@@ -235,18 +238,18 @@ static int __init mtk_timer_init(struct device_node *node)
evt->ticks_per_jiffy = DIV_ROUND_UP(rate, HZ); evt->ticks_per_jiffy = DIV_ROUND_UP(rate, HZ);
/* Configure clock source */ /* Configure clock source */
mtk_timer_setup(evt, GPT_CLK_SRC, TIMER_CTRL_OP_FREERUN); mtk_gpt_setup(evt, TIMER_CLK_SRC, GPT_CTRL_OP_FREERUN);
clocksource_mmio_init(evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC), clocksource_mmio_init(evt->gpt_base + GPT_CNT_REG(TIMER_CLK_SRC),
node->name, rate, 300, 32, clocksource_mmio_readl_up); node->name, rate, 300, 32, clocksource_mmio_readl_up);
gpt_sched_reg = evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC); gpt_sched_reg = evt->gpt_base + GPT_CNT_REG(TIMER_CLK_SRC);
sched_clock_register(mtk_read_sched_clock, 32, rate); sched_clock_register(mtk_gpt_read_sched_clock, 32, rate);
/* Configure clock event */ /* Configure clock event */
mtk_timer_setup(evt, GPT_CLK_EVT, TIMER_CTRL_OP_REPEAT); mtk_gpt_setup(evt, TIMER_CLK_EVT, GPT_CTRL_OP_REPEAT);
clockevents_config_and_register(&evt->dev, rate, 0x3, clockevents_config_and_register(&evt->dev, rate, TIMER_SYNC_TICKS,
0xffffffff); 0xffffffff);
mtk_timer_enable_irq(evt, GPT_CLK_EVT); mtk_gpt_enable_irq(evt, TIMER_CLK_EVT);
return 0; return 0;
...@@ -265,4 +268,4 @@ static int __init mtk_timer_init(struct device_node *node) ...@@ -265,4 +268,4 @@ static int __init mtk_timer_init(struct device_node *node)
return -EINVAL; return -EINVAL;
} }
TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_gpt_init);
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7