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/78] soc: mediatek: PMIC wrap: SPI_WRITE needs a different
5 bitmask for MT2701/7623
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.
11 Signed-off-by: John Crispin <blogic@openwrt.org>
13 drivers/soc/mediatek/mtk-pmic-wrap.c | 11 +++++++----
14 1 file changed, 7 insertions(+), 4 deletions(-)
16 diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
17 index 9df1135..8ce1bad 100644
18 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
19 +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
20 @@ -372,6 +372,7 @@ struct pmic_wrapper_type {
25 int (*init_reg_clock)(struct pmic_wrapper *wrp);
26 int (*init_soc_specific)(struct pmic_wrapper *wrp);
28 @@ -511,15 +512,15 @@ static int pwrap_reset_spislave(struct pmic_wrapper *wrp)
29 pwrap_writel(wrp, 1, PWRAP_MAN_EN);
30 pwrap_writel(wrp, 0, PWRAP_DIO_EN);
32 - pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_CSL,
33 + pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_CSL,
35 - pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_OUTS,
36 + pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_OUTS,
38 - pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_CSH,
39 + pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_CSH,
42 for (i = 0; i < 4; i++)
43 - pwrap_writel(wrp, PWRAP_MAN_CMD_SPI_WRITE | PWRAP_MAN_CMD_OP_OUTS,
44 + pwrap_writel(wrp, wrp->master->spi_w | PWRAP_MAN_CMD_OP_OUTS,
47 ret = pwrap_wait_for_state(wrp, pwrap_is_sync_idle);
48 @@ -827,6 +828,7 @@ static struct pmic_wrapper_type pwrap_mt8135 = {
51 .int_en_all = ~(BIT(31) | BIT(1)),
52 + .spi_w = PWRAP_MAN_CMD_SPI_WRITE,
53 .init_reg_clock = pwrap_mt8135_init_reg_clock,
54 .init_soc_specific = pwrap_mt8135_init_soc_specific,
56 @@ -836,6 +838,7 @@ static struct pmic_wrapper_type pwrap_mt8173 = {
59 .int_en_all = ~(BIT(31) | BIT(1)),
60 + .spi_w = PWRAP_MAN_CMD_SPI_WRITE,
61 .init_reg_clock = pwrap_mt8173_init_reg_clock,
62 .init_soc_specific = pwrap_mt8173_init_soc_specific,