target/linux/mediatek/patches-4.4/0035-soc-mediatek-PMIC-wrap-WRAP_INT_EN-needs-a-different.patch

   1 From 274fd9ba57170de88bbdf522cbd6c290c2e51fb8 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 035/102] 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 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
  15 +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
  16 @@ -371,6 +371,7 @@ struct pmic_wrapper_type {
  17         int *regs;
  18         enum pwrap_type type;
  19         u32 arb_en_all;
  20 +       u32 int_en_all;
  21         int (*init_reg_clock)(struct pmic_wrapper *wrp);
  22         int (*init_soc_specific)(struct pmic_wrapper *wrp);
  23  };
  24 @@ -825,6 +826,7 @@ static struct pmic_wrapper_type pwrap_mt
  25         .regs = mt8135_regs,
  26         .type = PWRAP_MT8135,
  27         .arb_en_all = 0x1ff,
  28 +       .int_en_all = ~(BIT(31) | BIT(1)),
  29         .init_reg_clock = pwrap_mt8135_init_reg_clock,
  30         .init_soc_specific = pwrap_mt8135_init_soc_specific,
  31  };
  32 @@ -833,6 +835,7 @@ static struct pmic_wrapper_type pwrap_mt
  33         .regs = mt8173_regs,
  34         .type = PWRAP_MT8173,
  35         .arb_en_all = 0x3f,
  36 +       .int_en_all = ~(BIT(31) | BIT(1)),
  37         .init_reg_clock = pwrap_mt8173_init_reg_clock,
  38         .init_soc_specific = pwrap_mt8173_init_soc_specific,
  39  };
  40 @@ -946,7 +949,7 @@ static int pwrap_probe(struct platform_d
  41                         PWRAP_WDT_SRC_MASK_NO_STAUPD : PWRAP_WDT_SRC_MASK_ALL;
  42         pwrap_writel(wrp, wdt_src, PWRAP_WDT_SRC_EN);
  43         pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN);
  44 -       pwrap_writel(wrp, ~((1 << 31) | (1 << 1)), PWRAP_INT_EN);
  45 +       pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN);
  46
  47         irq = platform_get_irq(pdev, 0);
  48         ret = devm_request_irq(wrp->dev, irq, pwrap_interrupt, IRQF_TRIGGER_HIGH,