| Message ID | 1536064314-31967-4-git-send-email-argus.lin@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Pwrap: Mediatek pwrap driver for mt6765 | expand |
On 04/09/2018 14:31, Argus Lin wrote: > MT6357 is a new power management IC and it is used for mt6765 SoCs. > To define mt6357_regs for pmic register mapping and pmic_mt6357 > for accessing register. > > Signed-off-by: Argus Lin <argus.lin@mediatek.com> Needed some handwork to get it applied, please check that no bug slipped in. Applied to v4.19-ext/soc Thanks a lot. > --- > drivers/soc/mediatek/mtk-pmic-wrap.c | 35 ++++++++++++++++++++++++++++++++--- > 1 file changed, 32 insertions(+), 3 deletions(-) > > diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c > index ddaeace..2b2cee1 100644 > --- a/drivers/soc/mediatek/mtk-pmic-wrap.c > +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c > @@ -161,6 +161,21 @@ enum dew_regs { > [PWRAP_DEW_RDDMY_NO] = 0x030C, > }; > > +static const u32 mt6357_regs[] = { > + [PWRAP_DEW_DIO_EN] = 0x040A, > + [PWRAP_DEW_READ_TEST] = 0x040C, > + [PWRAP_DEW_WRITE_TEST] = 0x040E, > + [PWRAP_DEW_CRC_EN] = 0x0412, > + [PWRAP_DEW_CRC_VAL] = 0x0414, > + [PWRAP_DEW_CIPHER_KEY_SEL] = 0x0418, > + [PWRAP_DEW_CIPHER_IV_SEL] = 0x041A, > + [PWRAP_DEW_CIPHER_EN] = 0x041C, > + [PWRAP_DEW_CIPHER_RDY] = 0x041E, > + [PWRAP_DEW_CIPHER_MODE] = 0x0420, > + [PWRAP_DEW_CIPHER_SWRST] = 0x0422, > + [PWRAP_DEW_RDDMY_NO] = 0x0424, > +}; > + > enum pwrap_regs { > PWRAP_MUX_SEL, > PWRAP_WRAP_EN, > @@ -716,6 +731,7 @@ enum pwrap_regs { > enum pmic_type { > PMIC_MT6323, > PMIC_MT6351, > + PMIC_MT6357, > PMIC_MT6380, > PMIC_MT6397, > }; > @@ -1175,6 +1191,7 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp) > break; > case PMIC_MT6323: > case PMIC_MT6351: > + case PMIC_MT6357: > pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_EN], > 0x1); > break; > @@ -1460,11 +1477,26 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id) > .pwrap_write = pwrap_write16, > }; > > +static const struct pwrap_slv_type pmic_mt6357 = { > + .dew_regs = mt6357_regs, > + .type = PMIC_MT6357, > + .regmap = &pwrap_regmap_config16, > + .caps = 0, > + .pwrap_read = pwrap_read16, > + .pwrap_write = pwrap_write16, > +}; > + > static const struct of_device_id of_slave_match_tbl[] = { > { > .compatible = "mediatek,mt6323", > .data = &pmic_mt6323, > }, { > + .compatible = "mediatek,mt6351", > + .data = &pmic_mt6351, > + }, { > + .compatible = "mediatek,mt6357", > + .data = &pmic_mt6357, > + }, { > /* The MT6380 PMIC only implements a regulator, so we bind it > * directly instead of using a MFD. > */ > @@ -1474,9 +1506,6 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id) > .compatible = "mediatek,mt6397", > .data = &pmic_mt6397, > }, { > - .compatible = "mediatek,mt6351", > - .data = &pmic_mt6351, > - }, { > /* sentinel */ > } > }; >
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c index ddaeace..2b2cee1 100644 --- a/drivers/soc/mediatek/mtk-pmic-wrap.c +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c @@ -161,6 +161,21 @@ enum dew_regs { [PWRAP_DEW_RDDMY_NO] = 0x030C, }; +static const u32 mt6357_regs[] = { + [PWRAP_DEW_DIO_EN] = 0x040A, + [PWRAP_DEW_READ_TEST] = 0x040C, + [PWRAP_DEW_WRITE_TEST] = 0x040E, + [PWRAP_DEW_CRC_EN] = 0x0412, + [PWRAP_DEW_CRC_VAL] = 0x0414, + [PWRAP_DEW_CIPHER_KEY_SEL] = 0x0418, + [PWRAP_DEW_CIPHER_IV_SEL] = 0x041A, + [PWRAP_DEW_CIPHER_EN] = 0x041C, + [PWRAP_DEW_CIPHER_RDY] = 0x041E, + [PWRAP_DEW_CIPHER_MODE] = 0x0420, + [PWRAP_DEW_CIPHER_SWRST] = 0x0422, + [PWRAP_DEW_RDDMY_NO] = 0x0424, +}; + enum pwrap_regs { PWRAP_MUX_SEL, PWRAP_WRAP_EN, @@ -716,6 +731,7 @@ enum pwrap_regs { enum pmic_type { PMIC_MT6323, PMIC_MT6351, + PMIC_MT6357, PMIC_MT6380, PMIC_MT6397, }; @@ -1175,6 +1191,7 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp) break; case PMIC_MT6323: case PMIC_MT6351: + case PMIC_MT6357: pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_EN], 0x1); break; @@ -1460,11 +1477,26 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id) .pwrap_write = pwrap_write16, }; +static const struct pwrap_slv_type pmic_mt6357 = { + .dew_regs = mt6357_regs, + .type = PMIC_MT6357, + .regmap = &pwrap_regmap_config16, + .caps = 0, + .pwrap_read = pwrap_read16, + .pwrap_write = pwrap_write16, +}; + static const struct of_device_id of_slave_match_tbl[] = { { .compatible = "mediatek,mt6323", .data = &pmic_mt6323, }, { + .compatible = "mediatek,mt6351", + .data = &pmic_mt6351, + }, { + .compatible = "mediatek,mt6357", + .data = &pmic_mt6357, + }, { /* The MT6380 PMIC only implements a regulator, so we bind it * directly instead of using a MFD. */ @@ -1474,9 +1506,6 @@ static irqreturn_t pwrap_interrupt(int irqno, void *dev_id) .compatible = "mediatek,mt6397", .data = &pmic_mt6397, }, { - .compatible = "mediatek,mt6351", - .data = &pmic_mt6351, - }, { /* sentinel */ } };
MT6357 is a new power management IC and it is used for mt6765 SoCs. To define mt6357_regs for pmic register mapping and pmic_mt6357 for accessing register. Signed-off-by: Argus Lin <argus.lin@mediatek.com> --- drivers/soc/mediatek/mtk-pmic-wrap.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-)