2016-03-22 21:14:51 +00:00
|
|
|
From 72300493dbf58de75972fce86e64f4728ff9b594 Mon Sep 17 00:00:00 2001
|
2016-03-21 20:42:51 +00:00
|
|
|
From: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Date: Wed, 20 Jan 2016 10:14:39 +0100
|
2016-03-22 21:14:51 +00:00
|
|
|
Subject: [PATCH 35/66] soc: mediatek: PMIC wrap: WRAP_INT_EN needs a
|
2016-03-21 20:42:51 +00:00
|
|
|
different bitmask for MT2701/7623
|
|
|
|
|
|
|
|
|
|
MT2701 and MT7623 use a different bitmask for PWRAP_INT_EN.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/soc/mediatek/mtk-pmic-wrap.c | 5 ++++-
|
|
|
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
|
|
|
|
|
index 22c89e9..9df1135 100644
|
|
|
|
|
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
|
|
|
|
|
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
|
|
|
|
|
@@ -371,6 +371,7 @@ struct pmic_wrapper_type {
|
|
|
|
|
int *regs;
|
|
|
|
|
enum pwrap_type type;
|
|
|
|
|
u32 arb_en_all;
|
|
|
|
|
+ u32 int_en_all;
|
|
|
|
|
int (*init_reg_clock)(struct pmic_wrapper *wrp);
|
|
|
|
|
int (*init_soc_specific)(struct pmic_wrapper *wrp);
|
|
|
|
|
};
|
|
|
|
|
@@ -825,6 +826,7 @@ static struct pmic_wrapper_type pwrap_mt8135 = {
|
|
|
|
|
.regs = mt8135_regs,
|
|
|
|
|
.type = PWRAP_MT8135,
|
|
|
|
|
.arb_en_all = 0x1ff,
|
|
|
|
|
+ .int_en_all = ~(BIT(31) | BIT(1)),
|
|
|
|
|
.init_reg_clock = pwrap_mt8135_init_reg_clock,
|
|
|
|
|
.init_soc_specific = pwrap_mt8135_init_soc_specific,
|
|
|
|
|
};
|
|
|
|
|
@@ -833,6 +835,7 @@ static struct pmic_wrapper_type pwrap_mt8173 = {
|
|
|
|
|
.regs = mt8173_regs,
|
|
|
|
|
.type = PWRAP_MT8173,
|
|
|
|
|
.arb_en_all = 0x3f,
|
|
|
|
|
+ .int_en_all = ~(BIT(31) | BIT(1)),
|
|
|
|
|
.init_reg_clock = pwrap_mt8173_init_reg_clock,
|
|
|
|
|
.init_soc_specific = pwrap_mt8173_init_soc_specific,
|
|
|
|
|
};
|
|
|
|
|
@@ -946,7 +949,7 @@ static int pwrap_probe(struct platform_device *pdev)
|
|
|
|
|
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);
|
|
|
|
|
+ pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN);
|
|
|
|
|
|
|
|
|
|
irq = platform_get_irq(pdev, 0);
|
|
|
|
|
ret = devm_request_irq(wrp->dev, irq, pwrap_interrupt, IRQF_TRIGGER_HIGH,
|
|
|
|
|
--
|
|
|
|
|
1.7.10.4
|
|
|
|
|
|
