diff mbox series

[2/2] soc: mediatek: pwrap: add pwrap driver for MT8195 SoC

Message ID 20210602112050.12338-3-james.lo@mediatek.com (mailing list archive)
State New, archived
Headers show
Series [1/2] dt-bindings: mediatek: add compatible for MT8195 pwrap | expand

Commit Message

James Lo June 2, 2021, 11:20 a.m. UTC 
From: Henry Chen <henryc.chen@mediatek.com>

MT8195 are highly integrated SoC and use PMIC_MT6359 for
power management. This patch adds pwrap master driver to
access PMIC_MT6359.

Signed-off-by: Henry Chen <henryc.chen@mediatek.com>
---
 drivers/soc/mediatek/mtk-pmic-wrap.c | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Comments

Fei Shao June 9, 2021, 7:51 a.m. UTC | #1 
On Wed, Jun 2, 2021 at 7:21 PM James Lo <james.lo@mediatek.com> wrote:
>
> From: Henry Chen <henryc.chen@mediatek.com>
>
> MT8195 are highly integrated SoC and use PMIC_MT6359 for
> power management. This patch adds pwrap master driver to
> access PMIC_MT6359.
>
> Signed-off-by: Henry Chen <henryc.chen@mediatek.com>
> ---
>  drivers/soc/mediatek/mtk-pmic-wrap.c | 35 ++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
>
> diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
> index e4de75f35c33..952bc554f443 100644
> --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
> +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
> @@ -961,6 +961,23 @@ static int mt8183_regs[] = {
>         [PWRAP_WACS2_VLDCLR] =                  0xC28,
>  };
>
> +static int mt8195_regs[] = {
> +       [PWRAP_INIT_DONE2] =            0x0,
> +       [PWRAP_STAUPD_CTRL] =           0x4C,
> +       [PWRAP_TIMER_EN] =              0x3E4,
> +       [PWRAP_INT_EN] =                0x420,
> +       [PWRAP_INT_FLG] =               0x428,
> +       [PWRAP_INT_CLR] =               0x42C,
> +       [PWRAP_INT1_EN] =               0x450,
> +       [PWRAP_INT1_FLG] =              0x458,
> +       [PWRAP_INT1_CLR] =              0x45C,
> +       [PWRAP_WACS2_CMD] =             0x880,
> +       [PWRAP_SWINF_2_WDATA_31_0] =    0x884,
> +       [PWRAP_SWINF_2_RDATA_31_0] =    0x894,
> +       [PWRAP_WACS2_VLDCLR] =          0x8A4,
> +       [PWRAP_WACS2_RDATA] =           0x8A8,
> +};
> +
>  static int mt8516_regs[] = {
>         [PWRAP_MUX_SEL] =               0x0,
>         [PWRAP_WRAP_EN] =               0x4,
> @@ -1066,6 +1083,7 @@ enum pwrap_type {
>         PWRAP_MT8135,
>         PWRAP_MT8173,
>         PWRAP_MT8183,
> +       PWRAP_MT8195,
>         PWRAP_MT8516,
>  };
>
> @@ -1525,6 +1543,7 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp)
>                 break;
>         case PWRAP_MT6873:
>         case PWRAP_MT8183:
> +       case PWRAP_MT8195:
>                 break;
>         }
>
> @@ -2025,6 +2044,19 @@ static const struct pmic_wrapper_type pwrap_mt8183 = {
>         .init_soc_specific = pwrap_mt8183_init_soc_specific,
>  };
>
> +static struct pmic_wrapper_type pwrap_mt8195 = {
> +       .regs = mt8195_regs,
> +       .type = PWRAP_MT8195,
> +       .arb_en_all = 0x777f, /* NEED CONFIRM */
> +       .int_en_all = 0x180000, /* NEED CONFIRM */

Please get the confirmative values here then send the next patch, thanks.


> +       .int1_en_all = 0,
> +       .spi_w = PWRAP_MAN_CMD_SPI_WRITE,
> +       .wdt_src = PWRAP_WDT_SRC_MASK_ALL,
> +       .caps = PWRAP_CAP_INT1_EN | PWRAP_CAP_ARB,
> +       .init_reg_clock = pwrap_common_init_reg_clock,
> +       .init_soc_specific = NULL,
> +};
> +
>  static struct pmic_wrapper_type pwrap_mt8516 = {
>         .regs = mt8516_regs,
>         .type = PWRAP_MT8516,
> @@ -2065,6 +2097,9 @@ static const struct of_device_id of_pwrap_match_tbl[] = {
>         }, {
>                 .compatible = "mediatek,mt8183-pwrap",
>                 .data = &pwrap_mt8183,
> +       }, {
> +               .compatible = "mediatek,mt8195-pwrap",
> +               .data = &pwrap_mt8195,
>         }, {
>                 .compatible = "mediatek,mt8516-pwrap",
>                 .data = &pwrap_mt8516,
> --
> 2.18.0
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
Matthias Brugger June 9, 2021, 8:06 a.m. UTC | #2 
On 09/06/2021 09:51, Fei Shao wrote:
> On Wed, Jun 2, 2021 at 7:21 PM James Lo <james.lo@mediatek.com> wrote:
>>
>> From: Henry Chen <henryc.chen@mediatek.com>
>>
>> MT8195 are highly integrated SoC and use PMIC_MT6359 for
>> power management. This patch adds pwrap master driver to
>> access PMIC_MT6359.
>>
>> Signed-off-by: Henry Chen <henryc.chen@mediatek.com>
>> ---
>>  drivers/soc/mediatek/mtk-pmic-wrap.c | 35 ++++++++++++++++++++++++++++
>>  1 file changed, 35 insertions(+)
>>
>> diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
>> index e4de75f35c33..952bc554f443 100644
>> --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
>> +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
>> @@ -961,6 +961,23 @@ static int mt8183_regs[] = {
>>         [PWRAP_WACS2_VLDCLR] =                  0xC28,
>>  };
>>
>> +static int mt8195_regs[] = {
>> +       [PWRAP_INIT_DONE2] =            0x0,
>> +       [PWRAP_STAUPD_CTRL] =           0x4C,
>> +       [PWRAP_TIMER_EN] =              0x3E4,
>> +       [PWRAP_INT_EN] =                0x420,
>> +       [PWRAP_INT_FLG] =               0x428,
>> +       [PWRAP_INT_CLR] =               0x42C,
>> +       [PWRAP_INT1_EN] =               0x450,
>> +       [PWRAP_INT1_FLG] =              0x458,
>> +       [PWRAP_INT1_CLR] =              0x45C,
>> +       [PWRAP_WACS2_CMD] =             0x880,
>> +       [PWRAP_SWINF_2_WDATA_31_0] =    0x884,
>> +       [PWRAP_SWINF_2_RDATA_31_0] =    0x894,
>> +       [PWRAP_WACS2_VLDCLR] =          0x8A4,
>> +       [PWRAP_WACS2_RDATA] =           0x8A8,
>> +};
>> +
>>  static int mt8516_regs[] = {
>>         [PWRAP_MUX_SEL] =               0x0,
>>         [PWRAP_WRAP_EN] =               0x4,
>> @@ -1066,6 +1083,7 @@ enum pwrap_type {
>>         PWRAP_MT8135,
>>         PWRAP_MT8173,
>>         PWRAP_MT8183,
>> +       PWRAP_MT8195,
>>         PWRAP_MT8516,
>>  };
>>
>> @@ -1525,6 +1543,7 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp)
>>                 break;
>>         case PWRAP_MT6873:
>>         case PWRAP_MT8183:
>> +       case PWRAP_MT8195:
>>                 break;
>>         }
>>
>> @@ -2025,6 +2044,19 @@ static const struct pmic_wrapper_type pwrap_mt8183 = {
>>         .init_soc_specific = pwrap_mt8183_init_soc_specific,
>>  };
>>
>> +static struct pmic_wrapper_type pwrap_mt8195 = {
>> +       .regs = mt8195_regs,
>> +       .type = PWRAP_MT8195,
>> +       .arb_en_all = 0x777f, /* NEED CONFIRM */
>> +       .int_en_all = 0x180000, /* NEED CONFIRM */
> 
> Please get the confirmative values here then send the next patch, thanks.
> 

Yes please. You can send this as a follow-up patch, otherwise I'd need to remove
this from my queue, as I have overseen the fact that not all values are confirmed.

Regards,
Matthias
James Lo June 10, 2021, 2:44 a.m. UTC | #3 
On Wed, 2021-06-09 at 10:06 +0200, Matthias Brugger wrote:
> 
> On 09/06/2021 09:51, Fei Shao wrote:
> > On Wed, Jun 2, 2021 at 7:21 PM James Lo <james.lo@mediatek.com>
> > wrote:
> > > 
> > > From: Henry Chen <henryc.chen@mediatek.com>
> > > 
> > > MT8195 are highly integrated SoC and use PMIC_MT6359 for
> > > power management. This patch adds pwrap master driver to
> > > access PMIC_MT6359.
> > > 
> > > Signed-off-by: Henry Chen <henryc.chen@mediatek.com>
> > > ---
> > >  drivers/soc/mediatek/mtk-pmic-wrap.c | 35
> > > ++++++++++++++++++++++++++++
> > >  1 file changed, 35 insertions(+)
> > > 
> > > diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c
> > > b/drivers/soc/mediatek/mtk-pmic-wrap.c
> > > index e4de75f35c33..952bc554f443 100644
> > > --- a/drivers/soc/mediatek/mtk-pmic-wrap.c
> > > +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
> > > @@ -961,6 +961,23 @@ static int mt8183_regs[] = {
> > >         [PWRAP_WACS2_VLDCLR] =                  0xC28,
> > >  };
> > > 
> > > +static int mt8195_regs[] = {
> > > +       [PWRAP_INIT_DONE2] =            0x0,
> > > +       [PWRAP_STAUPD_CTRL] =           0x4C,
> > > +       [PWRAP_TIMER_EN] =              0x3E4,
> > > +       [PWRAP_INT_EN] =                0x420,
> > > +       [PWRAP_INT_FLG] =               0x428,
> > > +       [PWRAP_INT_CLR] =               0x42C,
> > > +       [PWRAP_INT1_EN] =               0x450,
> > > +       [PWRAP_INT1_FLG] =              0x458,
> > > +       [PWRAP_INT1_CLR] =              0x45C,
> > > +       [PWRAP_WACS2_CMD] =             0x880,
> > > +       [PWRAP_SWINF_2_WDATA_31_0] =    0x884,
> > > +       [PWRAP_SWINF_2_RDATA_31_0] =    0x894,
> > > +       [PWRAP_WACS2_VLDCLR] =          0x8A4,
> > > +       [PWRAP_WACS2_RDATA] =           0x8A8,
> > > +};
> > > +
> > >  static int mt8516_regs[] = {
> > >         [PWRAP_MUX_SEL] =               0x0,
> > >         [PWRAP_WRAP_EN] =               0x4,
> > > @@ -1066,6 +1083,7 @@ enum pwrap_type {
> > >         PWRAP_MT8135,
> > >         PWRAP_MT8173,
> > >         PWRAP_MT8183,
> > > +       PWRAP_MT8195,
> > >         PWRAP_MT8516,
> > >  };
> > > 
> > > @@ -1525,6 +1543,7 @@ static int pwrap_init_cipher(struct
> > > pmic_wrapper *wrp)
> > >                 break;
> > >         case PWRAP_MT6873:
> > >         case PWRAP_MT8183:
> > > +       case PWRAP_MT8195:
> > >                 break;
> > >         }
> > > 
> > > @@ -2025,6 +2044,19 @@ static const struct pmic_wrapper_type
> > > pwrap_mt8183 = {
> > >         .init_soc_specific = pwrap_mt8183_init_soc_specific,
> > >  };
> > > 
> > > +static struct pmic_wrapper_type pwrap_mt8195 = {
> > > +       .regs = mt8195_regs,
> > > +       .type = PWRAP_MT8195,
> > > +       .arb_en_all = 0x777f, /* NEED CONFIRM */
> > > +       .int_en_all = 0x180000, /* NEED CONFIRM */
> > 
> > Please get the confirmative values here then send the next patch,
> > thanks.
> > 
> 
> Yes please. You can send this as a follow-up patch, otherwise I'd
> need to remove
> this from my queue, as I have overseen the fact that not all values
> are confirmed.
> 
> Regards,
> Matthias

All values are confirmed and sorry for I forget to remove those
comments. Could you please help us to remove those comments ?

Before :
.arb_en_all = 0x777f, /* NEED CONFIRM */
.int_en_all = 0x180000, /* NEED CONFIRM */

After :
.arb_en_all = 0x777f,
.int_en_all = 0x180000,

Many thanks
James Lo
diff mbox series

Patch

diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index e4de75f35c33..952bc554f443 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -961,6 +961,23 @@  static int mt8183_regs[] = {
 	[PWRAP_WACS2_VLDCLR] =			0xC28,
 };
 
+static int mt8195_regs[] = {
+	[PWRAP_INIT_DONE2] =		0x0,
+	[PWRAP_STAUPD_CTRL] =		0x4C,
+	[PWRAP_TIMER_EN] =		0x3E4,
+	[PWRAP_INT_EN] =		0x420,
+	[PWRAP_INT_FLG] =		0x428,
+	[PWRAP_INT_CLR] =		0x42C,
+	[PWRAP_INT1_EN] =		0x450,
+	[PWRAP_INT1_FLG] =		0x458,
+	[PWRAP_INT1_CLR] =		0x45C,
+	[PWRAP_WACS2_CMD] =		0x880,
+	[PWRAP_SWINF_2_WDATA_31_0] =	0x884,
+	[PWRAP_SWINF_2_RDATA_31_0] =	0x894,
+	[PWRAP_WACS2_VLDCLR] =		0x8A4,
+	[PWRAP_WACS2_RDATA] =		0x8A8,
+};
+
 static int mt8516_regs[] = {
 	[PWRAP_MUX_SEL] =		0x0,
 	[PWRAP_WRAP_EN] =		0x4,
@@ -1066,6 +1083,7 @@  enum pwrap_type {
 	PWRAP_MT8135,
 	PWRAP_MT8173,
 	PWRAP_MT8183,
+	PWRAP_MT8195,
 	PWRAP_MT8516,
 };
 
@@ -1525,6 +1543,7 @@  static int pwrap_init_cipher(struct pmic_wrapper *wrp)
 		break;
 	case PWRAP_MT6873:
 	case PWRAP_MT8183:
+	case PWRAP_MT8195:
 		break;
 	}
 
@@ -2025,6 +2044,19 @@  static const struct pmic_wrapper_type pwrap_mt8183 = {
 	.init_soc_specific = pwrap_mt8183_init_soc_specific,
 };
 
+static struct pmic_wrapper_type pwrap_mt8195 = {
+	.regs = mt8195_regs,
+	.type = PWRAP_MT8195,
+	.arb_en_all = 0x777f, /* NEED CONFIRM */
+	.int_en_all = 0x180000, /* NEED CONFIRM */
+	.int1_en_all = 0,
+	.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
+	.wdt_src = PWRAP_WDT_SRC_MASK_ALL,
+	.caps = PWRAP_CAP_INT1_EN | PWRAP_CAP_ARB,
+	.init_reg_clock = pwrap_common_init_reg_clock,
+	.init_soc_specific = NULL,
+};
+
 static struct pmic_wrapper_type pwrap_mt8516 = {
 	.regs = mt8516_regs,
 	.type = PWRAP_MT8516,
@@ -2065,6 +2097,9 @@  static const struct of_device_id of_pwrap_match_tbl[] = {
 	}, {
 		.compatible = "mediatek,mt8183-pwrap",
 		.data = &pwrap_mt8183,
+	}, {
+		.compatible = "mediatek,mt8195-pwrap",
+		.data = &pwrap_mt8195,
 	}, {
 		.compatible = "mediatek,mt8516-pwrap",
 		.data = &pwrap_mt8516,