target/linux/mediatek/patches-4.4/0036-soc-mediatek-PMIC-wrap-SPI_WRITE-needs-a-different-b.patch

   1 From fca1819591e7824d474c900a3524c0c1fee6a300 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Wed, 20 Jan 2016 10:21:42 +0100
   4 Subject: [PATCH 36/81] soc: mediatek: PMIC wrap: SPI_WRITE needs a different
   5  bitmask for MT2701/7623
   6
   7 Different SoCs will use different bitmask for the SPI_WRITE command. This
   8 patch defines the bitmask in the pmic_wrapper_type struct. This allows us
   9 to support new SoCs with a different bitmask to the one currently used.
  10
  11 Signed-off-by: John Crispin <blogic@openwrt.org>
  12 ---
  13  drivers/soc/mediatek/mtk-pmic-wrap.c |   11 +++++++----
  14  1 file changed, 7 insertions(+), 4 deletions(-)
  15
  16 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
  17 +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
  18 @@ -372,6 +372,7 @@ struct pmic_wrapper_type {
  19         enum pwrap_type type;
  20         u32 arb_en_all;
  21         u32 int_en_all;
  22 +       u32 spi_w;
  23         int (*init_reg_clock)(struct pmic_wrapper *wrp);
  24         int (*init_soc_specific)(struct pmic_wrapper *wrp);
  25  };
  26 @@ -511,15 +512,15 @@ static int pwrap_reset_spislave(struct p
  27         pwrap_writel(wrp, 1, PWRAP_MAN_EN);
  28         pwrap_writel(wrp, 0, PWRAP_DIO_EN);
  29
  30 -       pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_CSL,
  31 +       pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_CSL,
  32                         PWRAP_MAN_CMD);
  33 -       pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_OUTS,
  34 +       pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_OUTS,
  35                         PWRAP_MAN_CMD);
  36 -       pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_CSH,
  37 +       pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_CSH,
  38                         PWRAP_MAN_CMD);
  39
  40         for (i = 0; i < 4; i++)
  41 -               pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_OUTS,
  42 +               pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_OUTS,
  43                                 PWRAP_MAN_CMD);
  44
  45         ret = pwrap_wait_for_state(wrp, pwrap_is_sync_idle);
  46 @@ -827,6 +828,7 @@ static struct pmic_wrapper_type pwrap_mt
  47         .type = PWRAP_MT8135,
  48         .arb_en_all = 0x1ff,
  49         .int_en_all = ~(BIT(31) | BIT(1)),
  50 +       .spi_w = PWRAP_MAN_CMD_SPI_WRITE,
  51         .init_reg_clock = pwrap_mt8135_init_reg_clock,
  52         .init_soc_specific = pwrap_mt8135_init_soc_specific,
  53  };
  54 @@ -836,6 +838,7 @@ static struct pmic_wrapper_type pwrap_mt
  55         .type = PWRAP_MT8173,
  56         .arb_en_all = 0x3f,
  57         .int_en_all = ~(BIT(31) | BIT(1)),
  58 +       .spi_w = PWRAP_MAN_CMD_SPI_WRITE,
  59         .init_reg_clock = pwrap_mt8173_init_reg_clock,
  60         .init_soc_specific = pwrap_mt8173_init_soc_specific,
  61  };