* [PATCH v3 1/3] dt-bindings: soc: mediatek: pwrap: add mt6572
2026-09-24 9:38 [PATCH v3 0/3] soc: mediatek: pwrap: mt6572 support + log level fixes Roman Vivchar via B4 Relay
@ 2026-09-24 9:38 ` Roman Vivchar via B4 Relay
2026-09-24 9:38 ` [PATCH v3 2/3] soc: mediatek: pwrap: use correct log level Roman Vivchar via B4 Relay
2026-09-24 9:38 ` [PATCH v3 3/3] soc: mediatek: pwrap: add mt6572 support Roman Vivchar via B4 Relay
2 siblings, 0 replies; 4+ messages in thread
From: Roman Vivchar via B4 Relay @ 2026-09-24 9:38 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Matthias Brugger,
AngeloGioacchino Del Regno, Flora Fu, Alexandre Mergnat
Cc: devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Roman Vivchar, Krzysztof Kozlowski
From: Roman Vivchar <rva333@protonmail.com>
Add a compatible string for the mt6572 SoC.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: Roman Vivchar <rva333@protonmail.com>
---
Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml b/Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml
index e7c4a3984c60..a3cf11153fba 100644
--- a/Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml
+++ b/Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml
@@ -31,6 +31,7 @@ properties:
- items:
- enum:
- mediatek,mt2701-pwrap
+ - mediatek,mt6572-pwrap
- mediatek,mt6765-pwrap
- mediatek,mt6779-pwrap
- mediatek,mt6795-pwrap
--
2.55.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3 2/3] soc: mediatek: pwrap: use correct log level
2026-09-24 9:38 [PATCH v3 0/3] soc: mediatek: pwrap: mt6572 support + log level fixes Roman Vivchar via B4 Relay
2026-09-24 9:38 ` [PATCH v3 1/3] dt-bindings: soc: mediatek: pwrap: add mt6572 Roman Vivchar via B4 Relay
@ 2026-09-24 9:38 ` Roman Vivchar via B4 Relay
2026-09-24 9:38 ` [PATCH v3 3/3] soc: mediatek: pwrap: add mt6572 support Roman Vivchar via B4 Relay
2 siblings, 0 replies; 4+ messages in thread
From: Roman Vivchar via B4 Relay @ 2026-09-24 9:38 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Matthias Brugger,
AngeloGioacchino Del Regno, Flora Fu, Alexandre Mergnat
Cc: devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Roman Vivchar
From: Roman Vivchar <rva333@protonmail.com>
Error paths should be dev_err, not dev_dbg. Replace all dev_dbg in error
branches to have the correct log level. Also simplify dev_err and return
with dev_err_probe.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Roman Vivchar <rva333@protonmail.com>
---
drivers/soc/mediatek/mtk-pmic-wrap.c | 45 ++++++++++++++----------------------
1 file changed, 17 insertions(+), 28 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index 0bcd85826375..a4b10b0a97cb 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -2475,10 +2475,9 @@ static int pwrap_probe(struct platform_device *pdev)
if (np->child)
of_slave_id = of_match_node(of_slave_match_tbl, np->child);
- if (!of_slave_id) {
- dev_dbg(&pdev->dev, "slave pmic should be defined in dts\n");
- return -EINVAL;
- }
+ if (!of_slave_id)
+ return dev_err_probe(&pdev->dev, -EINVAL,
+ "slave pmic should be defined in dts\n");
wrp = devm_kzalloc(&pdev->dev, sizeof(*wrp), GFP_KERNEL);
if (!wrp)
@@ -2496,11 +2495,9 @@ static int pwrap_probe(struct platform_device *pdev)
if (HAS_CAP(wrp->master->caps, PWRAP_CAP_RESET)) {
wrp->rstc = devm_reset_control_get(wrp->dev, "pwrap");
- if (IS_ERR(wrp->rstc)) {
- ret = PTR_ERR(wrp->rstc);
- dev_dbg(wrp->dev, "cannot get pwrap reset: %d\n", ret);
- return ret;
- }
+ if (IS_ERR(wrp->rstc))
+ return dev_err_probe(wrp->dev, PTR_ERR(wrp->rstc),
+ "cannot get pwrap reset\n");
}
if (HAS_CAP(wrp->master->caps, PWRAP_CAP_BRIDGE)) {
@@ -2510,12 +2507,9 @@ static int pwrap_probe(struct platform_device *pdev)
wrp->rstc_bridge = devm_reset_control_get(wrp->dev,
"pwrap-bridge");
- if (IS_ERR(wrp->rstc_bridge)) {
- ret = PTR_ERR(wrp->rstc_bridge);
- dev_dbg(wrp->dev,
- "cannot get pwrap-bridge reset: %d\n", ret);
- return ret;
- }
+ if (IS_ERR(wrp->rstc_bridge))
+ return dev_err_probe(wrp->dev, PTR_ERR(wrp->rstc_bridge),
+ "cannot get pwrap-bridge reset\n");
}
ret = devm_clk_bulk_get_all_enabled(wrp->dev, &clk);
@@ -2535,10 +2529,8 @@ static int pwrap_probe(struct platform_device *pdev)
*/
if (!pwrap_readl(wrp, PWRAP_INIT_DONE2)) {
ret = pwrap_init(wrp);
- if (ret) {
- dev_dbg(wrp->dev, "init failed with %d\n", ret);
- return ret;
- }
+ if (ret)
+ return dev_err_probe(wrp->dev, ret, "init failed\n");
}
if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB))
@@ -2548,10 +2540,9 @@ static int pwrap_probe(struct platform_device *pdev)
else
mask_done = PWRAP_STATE_INIT_DONE0;
- if (!(pwrap_readl(wrp, PWRAP_WACS2_RDATA) & mask_done)) {
- dev_dbg(wrp->dev, "initialization isn't finished\n");
- return -ENODEV;
- }
+ if (!(pwrap_readl(wrp, PWRAP_WACS2_RDATA) & mask_done))
+ return dev_err_probe(wrp->dev, -ENODEV,
+ "initialization isn't finished\n");
/* Initialize watchdog, may not be done by the bootloader */
if (!HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB))
@@ -2593,11 +2584,9 @@ static int pwrap_probe(struct platform_device *pdev)
return PTR_ERR(wrp->regmap);
ret = of_platform_populate(np, NULL, NULL, wrp->dev);
- if (ret) {
- dev_dbg(wrp->dev, "failed to create child devices at %pOF\n",
- np);
- return ret;
- }
+ if (ret)
+ return dev_err_probe(wrp->dev, ret,
+ "failed to create child devices at %pOF\n", np);
return 0;
}
--
2.55.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3 3/3] soc: mediatek: pwrap: add mt6572 support
2026-09-24 9:38 [PATCH v3 0/3] soc: mediatek: pwrap: mt6572 support + log level fixes Roman Vivchar via B4 Relay
2026-09-24 9:38 ` [PATCH v3 1/3] dt-bindings: soc: mediatek: pwrap: add mt6572 Roman Vivchar via B4 Relay
2026-09-24 9:38 ` [PATCH v3 2/3] soc: mediatek: pwrap: use correct log level Roman Vivchar via B4 Relay
@ 2026-09-24 9:38 ` Roman Vivchar via B4 Relay
2 siblings, 0 replies; 4+ messages in thread
From: Roman Vivchar via B4 Relay @ 2026-09-24 9:38 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Matthias Brugger,
AngeloGioacchino Del Regno, Flora Fu, Alexandre Mergnat
Cc: devicetree, linux-kernel, linux-arm-kernel, linux-mediatek,
Roman Vivchar
From: Roman Vivchar <rva333@protonmail.com>
Add mt6572 registers and platform data for the pmic wrapper.
While vendor kernel source code suggests that mt6572 can be paired with
the mt6320 PMIC, no such devices have been found yet. Hence, registers
that not included in the mt2701 array are omitted.
The mt2701 SoC-specific initialization function is used because they
share the same GPS_INTF settings.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Roman Vivchar <rva333@protonmail.com>
---
drivers/soc/mediatek/mtk-pmic-wrap.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index a4b10b0a97cb..3f05fc724e15 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -1314,6 +1314,7 @@ enum pmic_type {
enum pwrap_type {
PWRAP_MT2701,
+ PWRAP_MT6572,
PWRAP_MT6765,
PWRAP_MT6779,
PWRAP_MT6795,
@@ -1733,6 +1734,11 @@ static void pwrap_init_chip_select_ext(struct pmic_wrapper *wrp, u8 hext_write,
static int pwrap_common_init_reg_clock(struct pmic_wrapper *wrp)
{
switch (wrp->master->type) {
+ case PWRAP_MT6572:
+ pwrap_writel(wrp, 0x8, PWRAP_RDDMY);
+ pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_RDDMY_NO], 0x8);
+ pwrap_init_chip_select_ext(wrp, 5, 0, 0, 0);
+ break;
case PWRAP_MT6795:
if (wrp->slave->type == PMIC_MT6331) {
const u32 *dew_regs = wrp->slave->dew_regs;
@@ -1839,6 +1845,7 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp)
pwrap_writel(wrp, 1, PWRAP_CIPHER_START);
break;
case PWRAP_MT2701:
+ case PWRAP_MT6572:
case PWRAP_MT6765:
case PWRAP_MT6779:
case PWRAP_MT6795:
@@ -2277,6 +2284,24 @@ static const struct pmic_wrapper_type pwrap_mt2701 = {
.init_soc_specific = pwrap_mt2701_init_soc_specific,
};
+/*
+ * MT6572 register map is a superset of the MT2701. It has additional registers
+ * OP_TYPE (0x10), MSB_FIRST (0x14), GPS_STA (0x40) and SW_RST (0x180),
+ * which were omitted because the driver doesn't use them.
+ */
+static const struct pmic_wrapper_type pwrap_mt6572 = {
+ .regs = mt2701_regs,
+ .type = PWRAP_MT6572,
+ .arb_en_all = 0x1ff,
+ .int_en_all = 0x7ffffffd,
+ .int1_en_all = 0,
+ .spi_w = PWRAP_MAN_CMD_SPI_WRITE,
+ .wdt_src = PWRAP_WDT_SRC_MASK_ALL,
+ .caps = PWRAP_CAP_RESET | PWRAP_CAP_DCM,
+ .init_reg_clock = pwrap_common_init_reg_clock,
+ .init_soc_specific = pwrap_mt2701_init_soc_specific,
+};
+
static const struct pmic_wrapper_type pwrap_mt6765 = {
.regs = mt6765_regs,
.type = PWRAP_MT6765,
@@ -2446,6 +2471,7 @@ static const struct pmic_wrapper_type pwrap_mt8186 = {
static const struct of_device_id of_pwrap_match_tbl[] = {
{ .compatible = "mediatek,mt2701-pwrap", .data = &pwrap_mt2701 },
+ { .compatible = "mediatek,mt6572-pwrap", .data = &pwrap_mt6572 },
{ .compatible = "mediatek,mt6765-pwrap", .data = &pwrap_mt6765 },
{ .compatible = "mediatek,mt6779-pwrap", .data = &pwrap_mt6779 },
{ .compatible = "mediatek,mt6795-pwrap", .data = &pwrap_mt6795 },
--
2.55.0
^ permalink raw reply related [flat|nested] 4+ messages in thread