From dd4078c18b90befb896280c558ddcdb6f1f0c4d3 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 21 Mar 2016 20:42:51 +0000 Subject: mediatek: bump to v4.4 Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49064 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...k-enable-gpt6-on-boot-up-to-make-arch-tim.patch | 58 ---------------------- 1 file changed, 58 deletions(-) delete mode 100644 target/linux/mediatek/patches/0041-arm-mediatek-enable-gpt6-on-boot-up-to-make-arch-tim.patch (limited to 'target/linux/mediatek/patches/0041-arm-mediatek-enable-gpt6-on-boot-up-to-make-arch-tim.patch') diff --git a/target/linux/mediatek/patches/0041-arm-mediatek-enable-gpt6-on-boot-up-to-make-arch-tim.patch b/target/linux/mediatek/patches/0041-arm-mediatek-enable-gpt6-on-boot-up-to-make-arch-tim.patch deleted file mode 100644 index 48c7d142d9..0000000000 --- a/target/linux/mediatek/patches/0041-arm-mediatek-enable-gpt6-on-boot-up-to-make-arch-tim.patch +++ /dev/null @@ -1,58 +0,0 @@ -From eec99287ace37015ed313b4fc27ba205a158b66c Mon Sep 17 00:00:00 2001 -From: Matthias Brugger -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 -Signed-off-by: Yingjoe Chen ---- - 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 - #include -+#include -+#include -+#include -+ -+ -+#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 -- cgit v1.2.3