mediatek: update patches
[openwrt/staging/chunkeey.git] / target / linux / mediatek / patches-4.4 / 0035-soc-mediatek-PMIC-wrap-WRAP_INT_EN-needs-a-different.patch
1 From 7046dc2a485b2b2ec993d7c933820c8ae2b45718 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Wed, 20 Jan 2016 10:14:39 +0100
4 Subject: [PATCH 35/91] soc: mediatek: PMIC wrap: WRAP_INT_EN needs a
5 different bitmask for MT2701/7623
6
7 MT2701 and MT7623 use a different bitmask for PWRAP_INT_EN.
8
9 Signed-off-by: John Crispin <blogic@openwrt.org>
10 ---
11 drivers/soc/mediatek/mtk-pmic-wrap.c | 5 ++++-
12 1 file changed, 4 insertions(+), 1 deletion(-)
13
14 diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
15 index 22c89e9..9df1135 100644
16 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
17 +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
18 @@ -371,6 +371,7 @@ struct pmic_wrapper_type {
19 int *regs;
20 enum pwrap_type type;
21 u32 arb_en_all;
22 + u32 int_en_all;
23 int (*init_reg_clock)(struct pmic_wrapper *wrp);
24 int (*init_soc_specific)(struct pmic_wrapper *wrp);
25 };
26 @@ -825,6 +826,7 @@ static struct pmic_wrapper_type pwrap_mt8135 = {
27 .regs = mt8135_regs,
28 .type = PWRAP_MT8135,
29 .arb_en_all = 0x1ff,
30 + .int_en_all = ~(BIT(31) | BIT(1)),
31 .init_reg_clock = pwrap_mt8135_init_reg_clock,
32 .init_soc_specific = pwrap_mt8135_init_soc_specific,
33 };
34 @@ -833,6 +835,7 @@ static struct pmic_wrapper_type pwrap_mt8173 = {
35 .regs = mt8173_regs,
36 .type = PWRAP_MT8173,
37 .arb_en_all = 0x3f,
38 + .int_en_all = ~(BIT(31) | BIT(1)),
39 .init_reg_clock = pwrap_mt8173_init_reg_clock,
40 .init_soc_specific = pwrap_mt8173_init_soc_specific,
41 };
42 @@ -946,7 +949,7 @@ static int pwrap_probe(struct platform_device *pdev)
43 PWRAP_WDT_SRC_MASK_NO_STAUPD : PWRAP_WDT_SRC_MASK_ALL;
44 pwrap_writel(wrp, wdt_src, PWRAP_WDT_SRC_EN);
45 pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN);
46 - pwrap_writel(wrp, ~((1 << 31) | (1 << 1)), PWRAP_INT_EN);
47 + pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN);
48
49 irq = platform_get_irq(pdev, 0);
50 ret = devm_request_irq(wrp->dev, irq, pwrap_interrupt, IRQF_TRIGGER_HIGH,
51 --
52 1.7.10.4
53