diff options
author | John Crispin <john@openwrt.org> | 2016-03-21 20:42:51 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2016-03-21 20:42:51 +0000 |
commit | 5d2f529c9b83d5f769258928b5ddd82f4dc9979e (patch) | |
tree | 65ecb999d7bfda861006ffba75f375c1d7c8260d /target/linux/mediatek/patches/0041-arm-mediatek-enable-gpt6-on-boot-up-to-make-arch-tim.patch | |
parent | c8a6c583fc5f5c0834f993b591d6bb52d958c99a (diff) | |
download | mtk-20170518-5d2f529c9b83d5f769258928b5ddd82f4dc9979e.zip mtk-20170518-5d2f529c9b83d5f769258928b5ddd82f4dc9979e.tar.gz mtk-20170518-5d2f529c9b83d5f769258928b5ddd82f4dc9979e.tar.bz2 |
mediatek: bump to v4.4
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 49064
Diffstat (limited to 'target/linux/mediatek/patches/0041-arm-mediatek-enable-gpt6-on-boot-up-to-make-arch-tim.patch')
-rw-r--r-- | target/linux/mediatek/patches/0041-arm-mediatek-enable-gpt6-on-boot-up-to-make-arch-tim.patch | 58 |
1 files changed, 0 insertions, 58 deletions
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 48c7d14..0000000 --- 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 <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 |