mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
0ea329fec4
Weijie Gao has submitted an updated version of the patchset adding support for MT7986 and MT7981 to U-Boot. Use that v2 patchset. Changes of v2: - Add cpu driver for print_cpuinfo() - Fix NULL pointer dereference in mtk_image (was already fixed in OpenWrt) - Fix coding style - Minor changes https://patchwork.ozlabs.org/project/uboot/list/?series=316148 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
120 lines
3.4 KiB
Diff
120 lines
3.4 KiB
Diff
From a77b8f6d9aa90f80090e505d823a6dcf6b877136 Mon Sep 17 00:00:00 2001
|
|
From: Weijie Gao <weijie.gao@mediatek.com>
|
|
Date: Wed, 31 Aug 2022 19:04:40 +0800
|
|
Subject: [PATCH 14/32] timer: mtk: add support for MediaTek MT7981/MT7986 SoCs
|
|
|
|
This patch add general-purpose timer support for MediaTek MT7981/MT7986.
|
|
These two SoCs uses a newer version of timer with its register definition
|
|
slightly changed.
|
|
|
|
Reviewed-by: Simon Glass <sjg@chromium.org>
|
|
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
|
|
---
|
|
drivers/timer/mtk_timer.c | 59 ++++++++++++++++++++++++---------------
|
|
1 file changed, 37 insertions(+), 22 deletions(-)
|
|
|
|
--- a/drivers/timer/mtk_timer.c
|
|
+++ b/drivers/timer/mtk_timer.c
|
|
@@ -13,24 +13,32 @@
|
|
#include <asm/io.h>
|
|
#include <linux/bitops.h>
|
|
|
|
-#define MTK_GPT4_CTRL 0x40
|
|
-#define MTK_GPT4_CLK 0x44
|
|
-#define MTK_GPT4_CNT 0x48
|
|
-
|
|
-#define GPT4_ENABLE BIT(0)
|
|
-#define GPT4_CLEAR BIT(1)
|
|
-#define GPT4_FREERUN GENMASK(5, 4)
|
|
-#define GPT4_CLK_SYS 0x0
|
|
-#define GPT4_CLK_DIV1 0x0
|
|
+#define MTK_GPT4_OFFSET_V1 0x40
|
|
+#define MTK_GPT4_OFFSET_V2 0x80
|
|
+
|
|
+#define MTK_GPT_CON 0x0
|
|
+#define MTK_GPT_V1_CLK 0x4
|
|
+#define MTK_GPT_CNT 0x8
|
|
+
|
|
+#define GPT_ENABLE BIT(0)
|
|
+#define GPT_CLEAR BIT(1)
|
|
+#define GPT_V1_FREERUN GENMASK(5, 4)
|
|
+#define GPT_V2_FREERUN GENMASK(6, 5)
|
|
+
|
|
+enum mtk_gpt_ver {
|
|
+ MTK_GPT_V1,
|
|
+ MTK_GPT_V2
|
|
+};
|
|
|
|
struct mtk_timer_priv {
|
|
void __iomem *base;
|
|
+ unsigned int gpt4_offset;
|
|
};
|
|
|
|
static u64 mtk_timer_get_count(struct udevice *dev)
|
|
{
|
|
struct mtk_timer_priv *priv = dev_get_priv(dev);
|
|
- u32 val = readl(priv->base + MTK_GPT4_CNT);
|
|
+ u32 val = readl(priv->base + priv->gpt4_offset + MTK_GPT_CNT);
|
|
|
|
return timer_conv_64(val);
|
|
}
|
|
@@ -40,12 +48,27 @@ static int mtk_timer_probe(struct udevic
|
|
struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
|
|
struct mtk_timer_priv *priv = dev_get_priv(dev);
|
|
struct clk clk, parent;
|
|
- int ret;
|
|
+ int ret, gpt_ver;
|
|
|
|
priv->base = dev_read_addr_ptr(dev);
|
|
+ gpt_ver = dev_get_driver_data(dev);
|
|
+
|
|
if (!priv->base)
|
|
return -ENOENT;
|
|
|
|
+ if (gpt_ver == MTK_GPT_V2) {
|
|
+ priv->gpt4_offset = MTK_GPT4_OFFSET_V2;
|
|
+
|
|
+ writel(GPT_V2_FREERUN | GPT_CLEAR | GPT_ENABLE,
|
|
+ priv->base + priv->gpt4_offset + MTK_GPT_CON);
|
|
+ } else {
|
|
+ priv->gpt4_offset = MTK_GPT4_OFFSET_V1;
|
|
+
|
|
+ writel(GPT_V1_FREERUN | GPT_CLEAR | GPT_ENABLE,
|
|
+ priv->base + priv->gpt4_offset + MTK_GPT_CON);
|
|
+ writel(0, priv->base + priv->gpt4_offset + MTK_GPT_V1_CLK);
|
|
+ }
|
|
+
|
|
ret = clk_get_by_index(dev, 0, &clk);
|
|
if (ret)
|
|
return ret;
|
|
@@ -61,16 +84,6 @@ static int mtk_timer_probe(struct udevic
|
|
if (!uc_priv->clock_rate)
|
|
return -EINVAL;
|
|
|
|
- /*
|
|
- * Initialize the timer:
|
|
- * 1. set clock source to system clock with clock divider setting to 1
|
|
- * 2. set timer mode to free running
|
|
- * 3. reset timer counter to 0 then enable the timer
|
|
- */
|
|
- writel(GPT4_CLK_SYS | GPT4_CLK_DIV1, priv->base + MTK_GPT4_CLK);
|
|
- writel(GPT4_FREERUN | GPT4_CLEAR | GPT4_ENABLE,
|
|
- priv->base + MTK_GPT4_CTRL);
|
|
-
|
|
return 0;
|
|
}
|
|
|
|
@@ -79,8 +92,10 @@ static const struct timer_ops mtk_timer_
|
|
};
|
|
|
|
static const struct udevice_id mtk_timer_ids[] = {
|
|
- { .compatible = "mediatek,timer" },
|
|
- { .compatible = "mediatek,mt6577-timer" },
|
|
+ { .compatible = "mediatek,timer", .data = MTK_GPT_V1 },
|
|
+ { .compatible = "mediatek,mt6577-timer", .data = MTK_GPT_V1 },
|
|
+ { .compatible = "mediatek,mt7981-timer", .data = MTK_GPT_V2 },
|
|
+ { .compatible = "mediatek,mt7986-timer", .data = MTK_GPT_V2 },
|
|
{ }
|
|
};
|
|
|