f0a5f24217
- two upstreamed patches removed - compile tested all targets using 4.1 - run tested ar71xx Signed-off-by: Roman Yeryomin <roman@advem.lv> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47694
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
From eec99287ace37015ed313b4fc27ba205a158b66c Mon Sep 17 00:00:00 2001
|
|
From: Matthias Brugger <matthias.bgg@gmail.com>
|
|
Date: Fri, 1 May 2015 15:43:26 +0800
|
|
Subject: [PATCH 41/76] arm: mediatek: enable gpt6 on boot up to make arch
|
|
timer working
|
|
|
|
We enable GTP6 which ungates the arch timer clock.
|
|
In the future this should be done in the bootloader.
|
|
|
|
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
|
Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
|
|
---
|
|
arch/arm/mach-mediatek/mediatek.c | 29 +++++++++++++++++++++++++++++
|
|
1 file changed, 29 insertions(+)
|
|
|
|
--- a/arch/arm/mach-mediatek/mediatek.c
|
|
+++ b/arch/arm/mach-mediatek/mediatek.c
|
|
@@ -16,6 +16,34 @@
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <asm/mach/arch.h>
|
|
+#include <linux/of.h>
|
|
+#include <linux/clk-provider.h>
|
|
+#include <linux/clocksource.h>
|
|
+
|
|
+
|
|
+#define GPT6_CON_MT65xx 0x10008060
|
|
+#define GPT_ENABLE 0x31
|
|
+
|
|
+static void __init mediatek_timer_init(void)
|
|
+{
|
|
+ void __iomem *gpt_base = 0;
|
|
+
|
|
+ if (of_machine_is_compatible("mediatek,mt6589") ||
|
|
+ of_machine_is_compatible("mediatek,mt8135") ||
|
|
+ of_machine_is_compatible("mediatek,mt8127")) {
|
|
+ /* turn on GPT6 which ungates arch timer clocks */
|
|
+ gpt_base = ioremap(GPT6_CON_MT65xx, 0x04);
|
|
+ }
|
|
+
|
|
+ /* enabel clock and set to free-run */
|
|
+ if (gpt_base) {
|
|
+ writel(GPT_ENABLE, gpt_base);
|
|
+ iounmap(gpt_base);
|
|
+ }
|
|
+
|
|
+ of_clk_init(NULL);
|
|
+ clocksource_of_init();
|
|
+};
|
|
|
|
static const char * const mediatek_board_dt_compat[] = {
|
|
"mediatek,mt6589",
|
|
@@ -27,4 +55,5 @@ static const char * const mediatek_board
|
|
|
|
DT_MACHINE_START(MEDIATEK_DT, "Mediatek Cortex-A7 (Device Tree)")
|
|
.dt_compat = mediatek_board_dt_compat,
|
|
+ .init_time = mediatek_timer_init,
|
|
MACHINE_END
|