Skip to contentSkip to conversation

Add PMIC wrapper support for Mediatek MT8195 SoC IC

PATCH In review James Lo 3 participants 7 messages Jun 2, 2021 – Jun 10, 2021

Subsystems (2)
lore
Share & tools
lore

James Lo

author
#0 lore raw

This series adds support for new SoC MT8195 to the pmic-wrap driver.

Henry Chen (2):
dt-bindings: mediatek: add compatible for MT8195 pwrap
soc: mediatek: pwrap: add pwrap driver for MT8195 SoC

 .../bindings/soc/mediatek/pwrap.txt           |  1 +
 drivers/soc/mediatek/mtk-pmic-wrap.c          | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)
author
#1 lore raw

PATCH 1/2 dt-bindings: mediatek: add compatible for MT8195 pwrap

From: Henry Chen <[email protected]>

This adds dt-binding documentation of pwrap for Mediatek MT8195 SoCs Platform.

---
 Documentation/devicetree/bindings/soc/mediatek/pwrap.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/soc/mediatek/pwrap.txt +1 -0
index 8051c17e640e..d74a7a5ae9f2 100644
@@ -27,6 +27,7 @@ Required properties in pwrap device node.
 	"mediatek,mt8135-pwrap" for MT8135 SoCs
 	"mediatek,mt8173-pwrap" for MT8173 SoCs
 	"mediatek,mt8183-pwrap" for MT8183 SoCs
+	"mediatek,mt8195-pwrap" for MT8195 SoCs
 	"mediatek,mt8516-pwrap" for MT8516 SoCs
 - interrupts: IRQ for pwrap in SOC
 - reg-names: Must include the following entries:
Signature · 1 line
2.18.0
author
#2 lore raw

PATCH 2/2 soc: mediatek: pwrap: add pwrap driver for MT8195 SoC

In reply to James Lo

From: Henry Chen <[email protected]>

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

---
 drivers/soc/mediatek/mtk-pmic-wrap.c | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
drivers/soc/mediatek/mtk-pmic-wrap.c +35 -0
index e4de75f35c33..952bc554f443 100644
@@ -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,
Signature · 1 line
2.18.0
#3 lore raw

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

Quoted 57 lines · James Lo

From: Henry Chen <[email protected]>

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

---
 drivers/soc/mediatek/mtk-pmic-wrap.c | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
drivers/soc/mediatek/mtk-pmic-wrap.c +19 -0
index e4de75f35c33..952bc554f443 100644
@@ -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;
        }
 

drivers/soc/mediatek/mtk-pmic-wrap.c static const struct pmic_wrapper_type pwrap_mt8183 = { · line 2051

Quoted 8 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +5 -0
@@ -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.

Quoted 22 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +11 -1
+       .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,
--
Quoted 5 lines

2.18.0
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer
#4 lore raw

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

Quoted 61 lines · Fei Shao
Quoted 60 lines · James Lo

From: Henry Chen <[email protected]>

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

---
 drivers/soc/mediatek/mtk-pmic-wrap.c | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
drivers/soc/mediatek/mtk-pmic-wrap.c +19 -0
index e4de75f35c33..952bc554f443 100644
@@ -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,
 };
 
Quoted 8 lines

drivers/soc/mediatek/mtk-pmic-wrap.c static const struct pmic_wrapper_type pwrap_mt8183 = { · line 2051

Quoted 5 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +5 -0
+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

author
#5 lore raw

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

Quoted 78 lines · Matthias Brugger
Quoted 66 lines · Fei Shao
Quoted 64 lines · James Lo

From: Henry Chen <[email protected]>

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

---
 drivers/soc/mediatek/mtk-pmic-wrap.c | 35
++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
drivers/soc/mediatek/mtk-pmic-wrap.c +19 -0
index e4de75f35c33..952bc554f443 100644
@@ -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,
 };
 
Quoted 9 lines

drivers/soc/mediatek/mtk-pmic-wrap.c static const struct pmic_wrapper_type pwrap_mt8183 = { · line 2051

Quoted 5 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +5 -0
+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.

Quoted 7 lines

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

maintainer
#6 lore raw
In reply to James Lo
Quoted 5 lines · James Lo

This series adds support for new SoC MT8195 to the pmic-wrap driver.

Henry Chen (2):
dt-bindings: mediatek: add compatible for MT8195 pwrap
soc: mediatek: pwrap: add pwrap driver for MT8195 SoC

Whole series pushed to v5.13-next/soc

Thanks!

Quoted 6 lines
 .../bindings/soc/mediatek/pwrap.txt           |  1 +
 drivers/soc/mediatek/mtk-pmic-wrap.c          | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)