LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timer: orion-timer: Add support for other Armada SoC's 

This patch adds support for other Marvell Armada SoC's, supporting the
25MHz fixed clock operation, like the Armada XP etc.

Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Tony Dinh <mibodhi@gmail.com>
This commit is contained in:
Stefan Roese 2022-09-15 16:20:37 +02:00
parent 50e4d8511d
commit 89fd0cccf9
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/timer/Kconfig
View File

@ -203,8 +203,11 @@ config OMAP_TIMER
config ORION_TIMER config ORION_TIMER
bool "Orion timer support" bool "Orion timer support"
depends on TIMER depends on TIMER
default y if ARCH_KIRKWOOD || (ARCH_MVEBU && ARMADA_32BIT)
select TIMER_EARLY if ARCH_MVEBU
help help
Select this to enable an timer for Orion devices. Select this to enable an timer for Orion and Armada devices
like Armada XP etc.
config RISCV_TIMER config RISCV_TIMER
bool "RISC-V timer support" bool "RISC-V timer support"

42
drivers/timer/orion-timer.c
View File

@ -11,10 +11,34 @@
#define TIMER0_RELOAD 0x10 #define TIMER0_RELOAD 0x10
#define TIMER0_VAL 0x14 #define TIMER0_VAL 0x14
enum input_clock_type {
INPUT_CLOCK_NON_FIXED,
INPUT_CLOCK_25MHZ, /* input clock rate is fixed to 25MHz */
};
struct orion_timer_priv { struct orion_timer_priv {
void *base; void *base;
}; };
#define MVEBU_TIMER_FIXED_RATE_25MHZ 25000000
/**
* timer_early_get_rate() - Get the timer rate before driver model
*/
unsigned long notrace timer_early_get_rate(void)
{
return MVEBU_TIMER_FIXED_RATE_25MHZ;
}
/**
* timer_early_get_count() - Get the timer count before driver model
*
*/
u64 notrace timer_early_get_count(void)
{
return timer_conv_64(~readl(MVEBU_TIMER_BASE + TIMER0_VAL));
}
static uint64_t orion_timer_get_count(struct udevice *dev) static uint64_t orion_timer_get_count(struct udevice *dev)
{ {
struct orion_timer_priv *priv = dev_get_priv(dev); struct orion_timer_priv *priv = dev_get_priv(dev);
@ -25,6 +49,7 @@ static uint64_t orion_timer_get_count(struct udevice *dev)
static int orion_timer_probe(struct udevice *dev) static int orion_timer_probe(struct udevice *dev)
{ {
struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev); struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
enum input_clock_type type = dev_get_driver_data(dev);
struct orion_timer_priv *priv = dev_get_priv(dev); struct orion_timer_priv *priv = dev_get_priv(dev);
priv->base = devfdt_remap_addr_index(dev, 0); priv->base = devfdt_remap_addr_index(dev, 0);
@ -33,11 +58,20 @@ static int orion_timer_probe(struct udevice *dev)
return -ENOMEM; return -ENOMEM;
} }
uc_priv->clock_rate = CONFIG_SYS_TCLK;
writel(~0, priv->base + TIMER0_VAL); writel(~0, priv->base + TIMER0_VAL);
writel(~0, priv->base + TIMER0_RELOAD); writel(~0, priv->base + TIMER0_RELOAD);
if (type == INPUT_CLOCK_25MHZ) {
/*
* On Armada XP / 38x ..., the 25MHz clock source needs to
* be enabled
*/
setbits_le32(priv->base + TIMER_CTRL, BIT(11));
uc_priv->clock_rate = MVEBU_TIMER_FIXED_RATE_25MHZ;
} else {
uc_priv->clock_rate = CONFIG_SYS_TCLK;
}
/* enable timer */ /* enable timer */
setbits_le32(priv->base + TIMER_CTRL, TIMER0_EN | TIMER0_RELOAD_EN); setbits_le32(priv->base + TIMER_CTRL, TIMER0_EN | TIMER0_RELOAD_EN);
@ -49,7 +83,9 @@ static const struct timer_ops orion_timer_ops = {
}; };
static const struct udevice_id orion_timer_ids[] = { static const struct udevice_id orion_timer_ids[] = {
{ .compatible = "marvell,orion-timer" }, { .compatible = "marvell,orion-timer", .data = INPUT_CLOCK_NON_FIXED },
{ .compatible = "marvell,armada-370-timer", .data = INPUT_CLOCK_25MHZ },
{ .compatible = "marvell,armada-xp-timer", .data = INPUT_CLOCK_25MHZ },
{} {}
}; };