Messages in this thread | | | Date | Wed, 17 Nov 2021 14:50:42 +0100 | Subject | Re: [PATCH v15 4/4] spmi: mediatek: Add support for MT8195 | From | Matthias Brugger <> |
| |
On 15/11/2021 05:20, James Lo wrote: > Add spmi support for MT8195. > Refine indent in spmi-mtk-pmif.c. > > Signed-off-by: James Lo <james.lo@mediatek.com> > Signed-off-by: Henry Chen <henryc.chen@mediatek.com> > Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@mediatek.com> > Acked-By: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/spmi/spmi-mtk-pmif.c | 202 +++++++++++++++++++++++++---------- > 1 file changed, 145 insertions(+), 57 deletions(-) > > diff --git a/drivers/spmi/spmi-mtk-pmif.c b/drivers/spmi/spmi-mtk-pmif.c > index 3283d0a5903c..ad511f2c3324 100644 > --- a/drivers/spmi/spmi-mtk-pmif.c > +++ b/drivers/spmi/spmi-mtk-pmif.c > @@ -105,51 +105,99 @@ enum pmif_regs { > }; > > static const u32 mt6873_regs[] = { > - [PMIF_INIT_DONE] = 0x0000, > - [PMIF_INF_EN] = 0x0024, > - [PMIF_ARB_EN] = 0x0150, > - [PMIF_CMDISSUE_EN] = 0x03B4, > - [PMIF_TIMER_CTRL] = 0x03E0, > - [PMIF_SPI_MODE_CTRL] = 0x0400, > - [PMIF_IRQ_EVENT_EN_0] = 0x0418, > - [PMIF_IRQ_FLAG_0] = 0x0420, > - [PMIF_IRQ_CLR_0] = 0x0424, > - [PMIF_IRQ_EVENT_EN_1] = 0x0428, > - [PMIF_IRQ_FLAG_1] = 0x0430, > - [PMIF_IRQ_CLR_1] = 0x0434, > - [PMIF_IRQ_EVENT_EN_2] = 0x0438, > - [PMIF_IRQ_FLAG_2] = 0x0440, > - [PMIF_IRQ_CLR_2] = 0x0444, > - [PMIF_IRQ_EVENT_EN_3] = 0x0448, > - [PMIF_IRQ_FLAG_3] = 0x0450, > - [PMIF_IRQ_CLR_3] = 0x0454, > - [PMIF_IRQ_EVENT_EN_4] = 0x0458, > - [PMIF_IRQ_FLAG_4] = 0x0460, > - [PMIF_IRQ_CLR_4] = 0x0464, > - [PMIF_WDT_EVENT_EN_0] = 0x046C, > - [PMIF_WDT_FLAG_0] = 0x0470, > - [PMIF_WDT_EVENT_EN_1] = 0x0474, > - [PMIF_WDT_FLAG_1] = 0x0478, > - [PMIF_SWINF_0_ACC] = 0x0C00, > - [PMIF_SWINF_0_WDATA_31_0] = 0x0C04, > - [PMIF_SWINF_0_RDATA_31_0] = 0x0C14, > - [PMIF_SWINF_0_VLD_CLR] = 0x0C24, > - [PMIF_SWINF_0_STA] = 0x0C28, > - [PMIF_SWINF_1_ACC] = 0x0C40, > - [PMIF_SWINF_1_WDATA_31_0] = 0x0C44, > - [PMIF_SWINF_1_RDATA_31_0] = 0x0C54, > - [PMIF_SWINF_1_VLD_CLR] = 0x0C64, > - [PMIF_SWINF_1_STA] = 0x0C68, > - [PMIF_SWINF_2_ACC] = 0x0C80, > - [PMIF_SWINF_2_WDATA_31_0] = 0x0C84, > - [PMIF_SWINF_2_RDATA_31_0] = 0x0C94, > - [PMIF_SWINF_2_VLD_CLR] = 0x0CA4, > - [PMIF_SWINF_2_STA] = 0x0CA8, > - [PMIF_SWINF_3_ACC] = 0x0CC0, > - [PMIF_SWINF_3_WDATA_31_0] = 0x0CC4, > - [PMIF_SWINF_3_RDATA_31_0] = 0x0CD4, > - [PMIF_SWINF_3_VLD_CLR] = 0x0CE4, > - [PMIF_SWINF_3_STA] = 0x0CE8,
Please fix format in patch 3/4.
> + [PMIF_INIT_DONE] = 0x0000, > + [PMIF_INF_EN] = 0x0024, > + [PMIF_ARB_EN] = 0x0150, > + [PMIF_CMDISSUE_EN] = 0x03B4, > + [PMIF_TIMER_CTRL] = 0x03E0, > + [PMIF_SPI_MODE_CTRL] = 0x0400, > + [PMIF_IRQ_EVENT_EN_0] = 0x0418, > + [PMIF_IRQ_FLAG_0] = 0x0420, > + [PMIF_IRQ_CLR_0] = 0x0424, > + [PMIF_IRQ_EVENT_EN_1] = 0x0428, > + [PMIF_IRQ_FLAG_1] = 0x0430, > + [PMIF_IRQ_CLR_1] = 0x0434, > + [PMIF_IRQ_EVENT_EN_2] = 0x0438, > + [PMIF_IRQ_FLAG_2] = 0x0440, > + [PMIF_IRQ_CLR_2] = 0x0444, > + [PMIF_IRQ_EVENT_EN_3] = 0x0448, > + [PMIF_IRQ_FLAG_3] = 0x0450, > + [PMIF_IRQ_CLR_3] = 0x0454, > + [PMIF_IRQ_EVENT_EN_4] = 0x0458, > + [PMIF_IRQ_FLAG_4] = 0x0460, > + [PMIF_IRQ_CLR_4] = 0x0464, > + [PMIF_WDT_EVENT_EN_0] = 0x046C, > + [PMIF_WDT_FLAG_0] = 0x0470, > + [PMIF_WDT_EVENT_EN_1] = 0x0474, > + [PMIF_WDT_FLAG_1] = 0x0478, > + [PMIF_SWINF_0_ACC] = 0x0C00, > + [PMIF_SWINF_0_WDATA_31_0] = 0x0C04, > + [PMIF_SWINF_0_RDATA_31_0] = 0x0C14, > + [PMIF_SWINF_0_VLD_CLR] = 0x0C24, > + [PMIF_SWINF_0_STA] = 0x0C28, > + [PMIF_SWINF_1_ACC] = 0x0C40, > + [PMIF_SWINF_1_WDATA_31_0] = 0x0C44, > + [PMIF_SWINF_1_RDATA_31_0] = 0x0C54, > + [PMIF_SWINF_1_VLD_CLR] = 0x0C64, > + [PMIF_SWINF_1_STA] = 0x0C68, > + [PMIF_SWINF_2_ACC] = 0x0C80, > + [PMIF_SWINF_2_WDATA_31_0] = 0x0C84, > + [PMIF_SWINF_2_RDATA_31_0] = 0x0C94, > + [PMIF_SWINF_2_VLD_CLR] = 0x0CA4, > + [PMIF_SWINF_2_STA] = 0x0CA8, > + [PMIF_SWINF_3_ACC] = 0x0CC0, > + [PMIF_SWINF_3_WDATA_31_0] = 0x0CC4, > + [PMIF_SWINF_3_RDATA_31_0] = 0x0CD4, > + [PMIF_SWINF_3_VLD_CLR] = 0x0CE4, > + [PMIF_SWINF_3_STA] = 0x0CE8, > +}; > + > +static const u32 mt8195_regs[] = { > + [PMIF_INIT_DONE] = 0x0000, > + [PMIF_INF_EN] = 0x0024, > + [PMIF_ARB_EN] = 0x0150, > + [PMIF_CMDISSUE_EN] = 0x03B8, > + [PMIF_TIMER_CTRL] = 0x03E4, > + [PMIF_SPI_MODE_CTRL] = 0x0408, > + [PMIF_IRQ_EVENT_EN_0] = 0x0420, > + [PMIF_IRQ_FLAG_0] = 0x0428, > + [PMIF_IRQ_CLR_0] = 0x042C, > + [PMIF_IRQ_EVENT_EN_1] = 0x0430, > + [PMIF_IRQ_FLAG_1] = 0x0438, > + [PMIF_IRQ_CLR_1] = 0x043C, > + [PMIF_IRQ_EVENT_EN_2] = 0x0440, > + [PMIF_IRQ_FLAG_2] = 0x0448, > + [PMIF_IRQ_CLR_2] = 0x044C, > + [PMIF_IRQ_EVENT_EN_3] = 0x0450, > + [PMIF_IRQ_FLAG_3] = 0x0458, > + [PMIF_IRQ_CLR_3] = 0x045C, > + [PMIF_IRQ_EVENT_EN_4] = 0x0460, > + [PMIF_IRQ_FLAG_4] = 0x0468, > + [PMIF_IRQ_CLR_4] = 0x046C, > + [PMIF_WDT_EVENT_EN_0] = 0x0474, > + [PMIF_WDT_FLAG_0] = 0x0478, > + [PMIF_WDT_EVENT_EN_1] = 0x047C, > + [PMIF_WDT_FLAG_1] = 0x0480, > + [PMIF_SWINF_0_ACC] = 0x0800, > + [PMIF_SWINF_0_WDATA_31_0] = 0x0804, > + [PMIF_SWINF_0_RDATA_31_0] = 0x0814, > + [PMIF_SWINF_0_VLD_CLR] = 0x0824, > + [PMIF_SWINF_0_STA] = 0x0828, > + [PMIF_SWINF_1_ACC] = 0x0840, > + [PMIF_SWINF_1_WDATA_31_0] = 0x0844, > + [PMIF_SWINF_1_RDATA_31_0] = 0x0854, > + [PMIF_SWINF_1_VLD_CLR] = 0x0864, > + [PMIF_SWINF_1_STA] = 0x0868, > + [PMIF_SWINF_2_ACC] = 0x0880, > + [PMIF_SWINF_2_WDATA_31_0] = 0x0884, > + [PMIF_SWINF_2_RDATA_31_0] = 0x0894, > + [PMIF_SWINF_2_VLD_CLR] = 0x08A4, > + [PMIF_SWINF_2_STA] = 0x08A8, > + [PMIF_SWINF_3_ACC] = 0x08C0, > + [PMIF_SWINF_3_WDATA_31_0] = 0x08C4, > + [PMIF_SWINF_3_RDATA_31_0] = 0x08D4, > + [PMIF_SWINF_3_VLD_CLR] = 0x08E4, > + [PMIF_SWINF_3_STA] = 0x08E8, > }; > > enum spmi_regs { > @@ -165,21 +213,52 @@ enum spmi_regs { > SPMI_REC3, > SPMI_REC4, > SPMI_MST_DBG, > + > + /* MT8195 spmi regs */ > + SPMI_MST_RCS_CTRL, > + SPMI_SLV_3_0_EINT, > + SPMI_SLV_7_4_EINT, > + SPMI_SLV_B_8_EINT, > + SPMI_SLV_F_C_EINT, > + SPMI_REC_CMD_DEC, > + SPMI_DEC_DBG, > }; > > static const u32 mt6873_spmi_regs[] = { > - [SPMI_OP_ST_CTRL] = 0x0000, > - [SPMI_GRP_ID_EN] = 0x0004, > - [SPMI_OP_ST_STA] = 0x0008, > - [SPMI_MST_SAMPL] = 0x000c, > - [SPMI_MST_REQ_EN] = 0x0010, > - [SPMI_REC_CTRL] = 0x0040, > - [SPMI_REC0] = 0x0044, > - [SPMI_REC1] = 0x0048, > - [SPMI_REC2] = 0x004c, > - [SPMI_REC3] = 0x0050, > - [SPMI_REC4] = 0x0054, > - [SPMI_MST_DBG] = 0x00fc,
Same here.
Regards, Matthias
| |