projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: socfpga: Enable all FPGA config support for Arria 10
[platform/kernel/u-boot.git]
/
arch
/
arm
/
mach-uniphier
/
arm64
/
timer.c
diff --git
a/arch/arm/mach-uniphier/arm64/timer.c
b/arch/arm/mach-uniphier/arm64/timer.c
index
4beab9d
..
c10903a
100644
(file)
--- a/
arch/arm/mach-uniphier/arm64/timer.c
+++ b/
arch/arm/mach-uniphier/arm64/timer.c
@@
-1,11
+1,10
@@
/*
/*
- * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2016 Socionext Inc.
+ * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
*
* SPDX-License-Identifier: GPL-2.0+
*/
-#include <common.h>
-#include <mapmem.h>
#include <linux/bitops.h>
#include <linux/io.h>
#include <linux/sizes.h>
#include <linux/bitops.h>
#include <linux/io.h>
#include <linux/sizes.h>
@@
-21,7
+20,7
@@
int timer_init(void)
void __iomem *base;
u32 tmp;
void __iomem *base;
u32 tmp;
- base =
map_sysmem
(CNT_CONTROL_BASE, SZ_4K);
+ base =
ioremap
(CNT_CONTROL_BASE, SZ_4K);
/*
* Note:
/*
* Note:
@@
-32,7
+31,7
@@
int timer_init(void)
tmp |= CNTCR_EN;
writel(tmp, base + CNTCR);
tmp |= CNTCR_EN;
writel(tmp, base + CNTCR);
-
unmap_sysmem
(base);
+
iounmap
(base);
return 0;
}
return 0;
}