2016-03-22 21:14:51 +00:00
|
|
|
From f8296ee9561945b5cebb570e06259b8865ef0b91 Mon Sep 17 00:00:00 2001
|
2016-03-21 20:42:51 +00:00
|
|
|
From: Henry Chen <henryc.chen@mediatek.com>
|
|
|
|
|
Date: Thu, 21 Jan 2016 19:04:00 +0800
|
2016-03-22 21:14:51 +00:00
|
|
|
Subject: [PATCH 29/66] soc: mediatek: PMIC wrap: clear the STAUPD_TRIG bit of
|
2016-03-21 20:42:51 +00:00
|
|
|
WDT_SRC_EN
|
|
|
|
|
|
|
|
|
|
Since STAUPD interrupts aren't handled on mt8173, disable watchdog timeout
|
|
|
|
|
monitor of STAUPD to avoid WDT_INT triggered by STAUPD.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Henry Chen <henryc.chen@mediatek.com>
|
|
|
|
|
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
|
|
|
|
|
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/soc/mediatek/mtk-pmic-wrap.c | 19 +++++++++++++++++--
|
|
|
|
|
1 file changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
|
|
|
|
|
index 696071b..0d9b19a 100644
|
|
|
|
|
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
|
|
|
|
|
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
|
|
|
|
|
@@ -60,6 +60,15 @@
|
|
|
|
|
#define PWRAP_MAN_CMD_OP_OUTD (0x9 << 8)
|
|
|
|
|
#define PWRAP_MAN_CMD_OP_OUTQ (0xa << 8)
|
|
|
|
|
|
|
|
|
|
+/* macro for Watch Dog Timer Source */
|
|
|
|
|
+#define PWRAP_WDT_SRC_EN_STAUPD_TRIG (1 << 25)
|
|
|
|
|
+#define PWRAP_WDT_SRC_EN_HARB_STAUPD_DLE (1 << 20)
|
|
|
|
|
+#define PWRAP_WDT_SRC_EN_HARB_STAUPD_ALE (1 << 6)
|
|
|
|
|
+#define PWRAP_WDT_SRC_MASK_ALL 0xffffffff
|
|
|
|
|
+#define PWRAP_WDT_SRC_MASK_NO_STAUPD ~(PWRAP_WDT_SRC_EN_STAUPD_TRIG | \
|
|
|
|
|
+ PWRAP_WDT_SRC_EN_HARB_STAUPD_DLE | \
|
|
|
|
|
+ PWRAP_WDT_SRC_EN_HARB_STAUPD_ALE)
|
|
|
|
|
+
|
|
|
|
|
/* macro for slave device wrapper registers */
|
|
|
|
|
#define PWRAP_DEW_BASE 0xbc00
|
|
|
|
|
#define PWRAP_DEW_EVENT_OUT_EN (PWRAP_DEW_BASE + 0x0)
|
|
|
|
|
@@ -822,7 +831,7 @@ MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl);
|
|
|
|
|
|
|
|
|
|
static int pwrap_probe(struct platform_device *pdev)
|
|
|
|
|
{
|
|
|
|
|
- int ret, irq;
|
|
|
|
|
+ int ret, irq, wdt_src;
|
|
|
|
|
struct pmic_wrapper *wrp;
|
|
|
|
|
struct device_node *np = pdev->dev.of_node;
|
|
|
|
|
const struct of_device_id *of_id =
|
|
|
|
|
@@ -912,7 +921,13 @@ static int pwrap_probe(struct platform_device *pdev)
|
|
|
|
|
|
|
|
|
|
/* Initialize watchdog, may not be done by the bootloader */
|
|
|
|
|
pwrap_writel(wrp, 0xf, PWRAP_WDT_UNIT);
|
|
|
|
|
- pwrap_writel(wrp, 0xffffffff, PWRAP_WDT_SRC_EN);
|
|
|
|
|
+ /*
|
|
|
|
|
+ * Since STAUPD was not used on mt8173 platform,
|
|
|
|
|
+ * so STAUPD of WDT_SRC which should be turned off
|
|
|
|
|
+ */
|
|
|
|
|
+ wdt_src = pwrap_is_mt8173(wrp) ?
|
|
|
|
|
+ PWRAP_WDT_SRC_MASK_NO_STAUPD : PWRAP_WDT_SRC_MASK_ALL;
|
|
|
|
|
+ pwrap_writel(wrp, wdt_src, PWRAP_WDT_SRC_EN);
|
|
|
|
|
pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN);
|
|
|
|
|
pwrap_writel(wrp, ~((1 << 31) | (1 << 1)), PWRAP_INT_EN);
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
1.7.10.4
|
|
|
|
|
|
