0035-soc-mediatek-PMIC-wrap-WRAP_INT_EN-needs-a-different.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  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. MT2701 and MT7623 use a different bitmask for PWRAP_INT_EN.
  7. Signed-off-by: John Crispin <blogic@openwrt.org>
  8. ---
  9. drivers/soc/mediatek/mtk-pmic-wrap.c | 5 ++++-
  10. 1 file changed, 4 insertions(+), 1 deletion(-)
  11. --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
  12. +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
  13. @@ -371,6 +371,7 @@ struct pmic_wrapper_type {
  14. int *regs;
  15. enum pwrap_type type;
  16. u32 arb_en_all;
  17. + u32 int_en_all;
  18. int (*init_reg_clock)(struct pmic_wrapper *wrp);
  19. int (*init_soc_specific)(struct pmic_wrapper *wrp);
  20. };
  21. @@ -825,6 +826,7 @@ static struct pmic_wrapper_type pwrap_mt
  22. .regs = mt8135_regs,
  23. .type = PWRAP_MT8135,
  24. .arb_en_all = 0x1ff,
  25. + .int_en_all = ~(BIT(31) | BIT(1)),
  26. .init_reg_clock = pwrap_mt8135_init_reg_clock,
  27. .init_soc_specific = pwrap_mt8135_init_soc_specific,
  28. };
  29. @@ -833,6 +835,7 @@ static struct pmic_wrapper_type pwrap_mt
  30. .regs = mt8173_regs,
  31. .type = PWRAP_MT8173,
  32. .arb_en_all = 0x3f,
  33. + .int_en_all = ~(BIT(31) | BIT(1)),
  34. .init_reg_clock = pwrap_mt8173_init_reg_clock,
  35. .init_soc_specific = pwrap_mt8173_init_soc_specific,
  36. };
  37. @@ -946,7 +949,7 @@ static int pwrap_probe(struct platform_d
  38. PWRAP_WDT_SRC_MASK_NO_STAUPD : PWRAP_WDT_SRC_MASK_ALL;
  39. pwrap_writel(wrp, wdt_src, PWRAP_WDT_SRC_EN);
  40. pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN);
  41. - pwrap_writel(wrp, ~((1 << 31) | (1 << 1)), PWRAP_INT_EN);
  42. + pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN);
  43. irq = platform_get_irq(pdev, 0);
  44. ret = devm_request_irq(wrp->dev, irq, pwrap_interrupt, IRQF_TRIGGER_HIGH,