diff options
| author | Stefan Roese <sr@denx.de> | 2014-10-22 12:13:08 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-23 09:59:20 -0400 |
| commit | 22700dc6fb7df443deb8d2a1bd5ab3aaecb63910 (patch) | |
| tree | 92b60160e6c143850090f3ce23a9e26d07d229ff /arch/arm/include/asm/arch-kirkwood/soc.h | |
| parent | 3e972cb9bad534d0b1a7d2cd3d3f6ad15aa7a4fd (diff) | |
| download | blackbird-obmc-uboot-22700dc6fb7df443deb8d2a1bd5ab3aaecb63910.tar.gz blackbird-obmc-uboot-22700dc6fb7df443deb8d2a1bd5ab3aaecb63910.zip | |
arm: marvell: Rework timer.c to make it usable for other MVEBU platforms
This patch does the following:
- Rename defines and registers to not use kirkwood
- Remove unused defines
- Use clrsetbits() accessor functions
- Coding style cleanup
- Clear 25MHZ bit in timer controller register init for Armada XP
There is no functional change for kirkwood. At least not intentionally.
This will be used by the upcoming Armada XP support.
Signed-off-by: Stefan Roese <sr@denx.de>
Tested-by: Luka Perkov <luka@openwrt.org>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Diffstat (limited to 'arch/arm/include/asm/arch-kirkwood/soc.h')
| -rw-r--r-- | arch/arm/include/asm/arch-kirkwood/soc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-kirkwood/soc.h b/arch/arm/include/asm/arch-kirkwood/soc.h index 3ea51d7848..29fb2d9d09 100644 --- a/arch/arm/include/asm/arch-kirkwood/soc.h +++ b/arch/arm/include/asm/arch-kirkwood/soc.h @@ -33,7 +33,7 @@ #define KW_SPI_BASE (KW_REGISTER(0x10600)) #define KW_CPU_WIN_BASE (KW_REGISTER(0x20000)) #define KW_CPU_REG_BASE (KW_REGISTER(0x20100)) -#define KW_TIMER_BASE (KW_REGISTER(0x20300)) +#define MVEBU_TIMER_BASE (KW_REGISTER(0x20300)) #define KW_REG_PCIE_BASE (KW_REGISTER(0x40000)) #define KW_USB20_BASE (KW_REGISTER(0x50000)) #define KW_EGIGA0_BASE (KW_REGISTER(0x72000)) |
