diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-06 08:44:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-06 08:44:23 -0400 |
| commit | 2afa989fbecf25ea23902a9c480f179ba608785a (patch) | |
| tree | 4d7dfaa06c49a01b573eb32ad48d780b546efc50 /arch/arm/mach-mvebu/timer.c | |
| parent | 2d4591353452638132d711551fec3495b7644731 (diff) | |
| parent | 3bb0458fa0ef127718ed1c47c33279f9ef03238d (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Kirkwood: remove km/keymile kirkwood boards (Holger)
- mtd: nand: pxa3xx: simplify ECC hardware parameters (Chris)
- tools: kwbimage: Verify maximal kwbimage header size (Pali)
- mvebu: Add support for programming LD eFuse on Armada 385 (Pali)
- mvebu: Misc timer improvements / cleanup (Stefan)
Diffstat (limited to 'arch/arm/mach-mvebu/timer.c')
| -rw-r--r-- | arch/arm/mach-mvebu/timer.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/arch/arm/mach-mvebu/timer.c b/arch/arm/mach-mvebu/timer.c deleted file mode 100644 index 557a378776..0000000000 --- a/arch/arm/mach-mvebu/timer.c +++ /dev/null @@ -1,41 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) Marvell International Ltd. and its affiliates - * Written-by: Prafulla Wadaskar <prafulla@marvell.com> - * - * Copyright (C) 2015 Stefan Roese <sr@denx.de> - */ - -#include <common.h> -#include <init.h> -#include <asm/io.h> -#include <asm/arch/soc.h> -#include <linux/bitops.h> - -#define TIMER_LOAD_VAL 0xffffffff - -static int init_done __section(".data") = 0; - -/* - * Timer initialization - */ -int timer_init(void) -{ - /* Only init the timer once */ - if (init_done) - return 0; - init_done = 1; - - /* load value into timer */ - writel(TIMER_LOAD_VAL, MVEBU_TIMER_BASE + 0x10); - writel(TIMER_LOAD_VAL, MVEBU_TIMER_BASE + 0x14); - -#if defined(CONFIG_ARCH_MVEBU) - /* On Armada XP / 38x ..., the 25MHz clock source needs to be enabled */ - setbits_le32(MVEBU_TIMER_BASE + 0x00, BIT(11)); -#endif - /* enable timer in auto reload mode */ - setbits_le32(MVEBU_TIMER_BASE + 0x00, 0x3); - - return 0; -} |