soc: mediatek: pwrap: MT6589 + MT6320 support
Subsystems (5)
cover soc: mediatek: pwrap: MT6589 + MT6320 support
This patch series adds support for MediaTek MT6589 PWRAP and MT6320 PMIC which are used together.
It also adds minimum compatibility string for MT6320.
Tested on Lenovo YOGA Tablet 10 Wi-Fi model.
Akari Tsuyukusa (3):
dt-bindings: soc: mediatek: pwrap: Add compatible for MT6589 SoC
dt-bindings: mfd: mediatek: mt6397: add MT6320 compatible string
soc: mediatek: pwrap: add MT6589 PWARP and MT6320 PMIC support
.../bindings/mfd/mediatek,mt6397.yaml | 1 + .../bindings/soc/mediatek/mediatek,pwrap.yaml | 5 +- drivers/soc/mediatek/mtk-pmic-wrap.c | 292 ++++++++++++++---- 3 files changed, 239 insertions(+), 59 deletions(-)
Signature · 1 line
2.54.0
PATCH 1/3 dt-bindings: soc: mediatek: pwrap: Add compatible for MT6589 SoC
Add compatible string for MediaTek MT6589 PWRAP. Also update the description since MT6589 has pwrap bridge.
--- .../devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml +3 -2
@@ -19,8 +19,8 @@ description: IP Pairing - On MT8135 the pins of some SoC internal peripherals can be on the PMIC. - The signals of these pins are routed over the SPI bus using the pwrap + On MT6589 and MT8135, the pins of some SoC internal peripherals can be on the + PMIC. The signals of these pins are routed over the SPI bus using the pwrap bridge. In the binding description below the properties needed for bridging are marked with "IP Pairing". These are optional on SoCs which do not support IP Pairing
@@ -31,6 +31,7 @@ properties: - items: - enum: - mediatek,mt2701-pwrap + - mediatek,mt6589-pwrap - mediatek,mt6765-pwrap - mediatek,mt6779-pwrap - mediatek,mt6795-pwrap
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH 1/3] dt-bindings: soc: mediatek: pwrap: Add compatible for MT6589 SoC
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 4 lines
Add compatible string for MediaTek MT6589 PWRAP. Also update the description since MT6589 has pwrap bridge.
Signed-off-by Akari Tsuyukusa <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
AngeloGioacchino Del Regno
maintainerRe: [PATCH 1/3] dt-bindings: soc: mediatek: pwrap: Add compatible for MT6589 SoC
In reply to Akari TsuyukusaQuoted 13 lines · Akari Tsuyukusa
Add compatible string for MediaTek MT6589 PWRAP. Also update the description since MT6589 has pwrap bridge.
Signed-off-by Akari Tsuyukusa <[email protected]>--- .../devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml +0
-0
Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml description: · line 22
Quoted 6 lines
Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml +1
-2@@ -19,8 +19,8 @@ description: IP Pairing - On MT8135 the pins of some SoC internal peripherals can be on the PMIC. - The signals of these pins are routed over the SPI bus using the pwrap + On MT6589 and MT8135, the pins of some SoC internal peripherals can be on the
Soon, this will become
"On MT6589, MT8135, MT1234, MT3456, MT...." :-)
So, perhaps, it's a better idea if we say:
"In some SoCs, some of the internal peripherals may be accessible only through the PMIC.
The signals of these pins are routed (blahblah)"
Cheers,
Angelo
PATCH 2/3 dt-bindings: mfd: mediatek: mt6397: add MT6320 compatible string
In reply to Akari TsuyukusaAdd compatible string for the MT6320 PMIC.
--- Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml +1 -0
@@ -34,6 +34,7 @@ properties: compatible: oneOf: - enum: + - mediatek,mt6320 - mediatek,mt6323 - mediatek,mt6331 # "mediatek,mt6331" for PMIC MT6331 and MT6332. - mediatek,mt6328
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH 2/3] dt-bindings: mfd: mediatek: mt6397: add MT6320 compatible string
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider: - [Low] Incomplete device tree binding schema for MT6320 sub-nodes. - [Low] MFD subsystem naming convention…
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
- [Low] Incomplete device tree binding schema for MT6320 sub-nodes.
- [Low] MFD subsystem naming convention violation in commit subject.
--
--- Patch [2]: [PATCH 2/3] dt-bindings: mfd: mediatek: mt6397: add MT6320 compatible string --- commit 4f9d7290dc8c6616ef111069a6c3bd9726e97d25
Author: Akari Tsuyukusa <[email protected]>
dt-bindings: mfd: mediatek: mt6397: add MT6320 compatible string
This commit adds the mediatek,mt6320 compatible string to the MT6397 PMIC device tree binding.
Quoted 1 line
dt-bindings: mfd: mediatek: mt6397: add MT6320 compatible string
[Severity: Low]
This isn't a bug, but the MFD subsystem guidelines request that the description following the subsystem prefix be capitalized. Should "add" be changed to "Add"?
Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml properties: · line 40
Quoted 11 lines
Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml +1
-0@@ -34,6 +34,7 @@ properties: compatible: oneOf: - enum: + - mediatek,mt6320 - mediatek,mt6323 - mediatek,mt6331 # "mediatek,mt6331" for PMIC MT6331 and MT6332. - mediatek,mt6328
[Severity: Low]
Will adding this top-level compatible string without updating the child regulator nodes cause schema validation to fail for a complete MT6320 node?
Looking at the properties:regulators section in this file, the compatible enum only allows mediatek,mt6323-regulator and mediatek,mt6328-regulator. Does the MT6320 require a corresponding compatible string added to the regulators sub-node, or a fallback to one of the existing variants?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
PATCH 3/3 soc: mediatek: pwrap: add MT6589 PWARP and MT6320 PMIC support
In reply to Akari TsuyukusaAdd support for MediaTek MT6589 PWRAP and MT6320 PMIC which are used together.
Since the PWRAP Bridge hardware on MT6589 is identical to the one on MT8135, refactor the existing register definitions:
- Rename the MT8135-specific "PWRAP_MT8135_BRIDGE_" prefix to a generic "PWRAP_BRIDGE_" prefix to reflect that they are shared across SoCs.
- Add the full set of PWRAP Bridge registers to match the hardware specification, rather than defining only a subset of them.
--- drivers/soc/mediatek/mtk-pmic-wrap.c | 292 +++++++++++++++++++++------ 1 file changed, 235 insertions(+), 57 deletions(-)
drivers/soc/mediatek/mtk-pmic-wrap.c +235 -57
@@ -17,15 +17,31 @@#define PWRAP_POLL_DELAY_US 10#define PWRAP_POLL_TIMEOUT_US 10000 -#define PWRAP_MT8135_BRIDGE_IORD_ARB_EN 0x4 -#define PWRAP_MT8135_BRIDGE_WACS3_EN 0x10 -#define PWRAP_MT8135_BRIDGE_INIT_DONE3 0x14 -#define PWRAP_MT8135_BRIDGE_WACS4_EN 0x24 -#define PWRAP_MT8135_BRIDGE_INIT_DONE4 0x28 -#define PWRAP_MT8135_BRIDGE_INT_EN 0x38 -#define PWRAP_MT8135_BRIDGE_TIMER_EN 0x48 -#define PWRAP_MT8135_BRIDGE_WDT_UNIT 0x50 -#define PWRAP_MT8135_BRIDGE_WDT_SRC_EN 0x54 +/* MT6589 and MT8135 specific PWARP Bridge registers */ +#define PWRAP_BRIDGE_IARB_INIT 0x0 +#define PWRAP_BRIDGE_IORD_ARB_EN 0x4 +#define PWRAP_BRIDGE_IARB_STA0 0x8 +#define PWRAP_BRIDGE_IARB_STA1 0xc +#define PWRAP_BRIDGE_WACS3_EN 0x10 +#define PWRAP_BRIDGE_INIT_DONE3 0x14 +#define PWRAP_BRIDGE_WACS3_CMD 0x18 +#define PWRAP_BRIDGE_WACS3_RDATA 0x1c +#define PWRAP_BRIDGE_WACS3_VLDCLR 0x20 +#define PWRAP_BRIDGE_WACS4_EN 0x24 +#define PWRAP_BRIDGE_INIT_DONE4 0x28 +#define PWRAP_BRIDGE_WACS4_CMD 0x2c +#define PWRAP_BRIDGE_WACS4_RDATA 0x30 +#define PWRAP_BRIDGE_WACS4_VLDCLR 0x34 +#define PWRAP_BRIDGE_INT_EN 0x38 +#define PWRAP_BRIDGE_INT_FLG_RAW 0x3c +#define PWRAP_BRIDGE_INT_FLG 0x40 +#define PWRAP_BRIDGE_INT_CLR 0x44 +#define PWRAP_BRIDGE_TIMER_EN 0x48 +#define PWRAP_BRIDGE_TIMER_STA 0x4c +#define PWRAP_BRIDGE_WDT_UNIT 0x50 +#define PWRAP_BRIDGE_WDT_SRC_EN 0x54 +#define PWRAP_BRIDGE_WDT_FLG 0x58 +#define PWRAP_BRIDGE_DEBUG_INT_SEL 0x5c/* macro for wrapper status */ #define PWRAP_GET_WACS_RDATA (x) (((x) >> 0) & 0x0000ffff)
@@ -100,6 +116,24 @@ enum dew_regs {PWRAP_DEW_CIPHER_MODE ,PWRAP_DEW_CIPHER_SWRST , +/* MT6320 only regs */ +PWRAP_DEW_CIPHER_IV0 , +PWRAP_DEW_CIPHER_IV1 , +PWRAP_DEW_CIPHER_IV2 , +PWRAP_DEW_CIPHER_IV3 , +PWRAP_DEW_CIPHER_IV4 , +PWRAP_DEW_CIPHER_IV5 , + +/* MT6320 and MT6397 only regs */ +PWRAP_DEW_EVENT_OUT_EN , +PWRAP_DEW_EVENT_SRC_EN , +PWRAP_DEW_EVENT_SRC , +PWRAP_DEW_EVENT_FLAG , +PWRAP_DEW_MON_FLAG_SEL , +PWRAP_DEW_EVENT_TEST , +PWRAP_DEW_CIPHER_LOAD , +PWRAP_DEW_CIPHER_START , +/* MT6323 only regs */ PWRAP_DEW_CIPHER_EN , PWRAP_DEW_RDDMY_NO,
@@ -142,16 +176,34 @@ enum dew_regs {PWRAP_DEW_RG_WDATA_MASK ,PWRAP_DEW_RG_SPI_RECORD_CLR , PWRAP_DEW_RG_CMD_ALERT_CLR, +}; -/* MT6397 only regs */ -PWRAP_DEW_EVENT_OUT_EN , -PWRAP_DEW_EVENT_SRC_EN , -PWRAP_DEW_EVENT_SRC , -PWRAP_DEW_EVENT_FLAG , -PWRAP_DEW_MON_FLAG_SEL , -PWRAP_DEW_EVENT_TEST , -PWRAP_DEW_CIPHER_LOAD , - PWRAP_DEW_CIPHER_START, +static const u32 mt6320_regs[] = { + [PWRAP_DEW_EVENT_OUT_EN ] =0x0000 , + [PWRAP_DEW_DIO_EN ] =0x0002 , + [PWRAP_DEW_EVENT_SRC_EN ] =0x0004 , + [PWRAP_DEW_EVENT_SRC ] =0x0006 , + [PWRAP_DEW_EVENT_FLAG ] =0x0008 , + [PWRAP_DEW_READ_TEST ] =0x000a , + [PWRAP_DEW_WRITE_TEST ] =0x000c , + [PWRAP_DEW_CRC_EN ] =0x000e , + [PWRAP_DEW_CRC_VAL ] =0x0010 , + [PWRAP_DEW_MON_GRP_SEL ] =0x0012 , + [PWRAP_DEW_MON_FLAG_SEL ] =0x0014 , + [PWRAP_DEW_EVENT_TEST ] =0x0016 , + [PWRAP_DEW_CIPHER_KEY_SEL ] =0x0018 , + [PWRAP_DEW_CIPHER_IV_SEL ] =0x001a , + [PWRAP_DEW_CIPHER_LOAD ] =0x001c , + [PWRAP_DEW_CIPHER_START ] =0x001e , + [PWRAP_DEW_CIPHER_RDY ] =0x0020 , + [PWRAP_DEW_CIPHER_MODE ] =0x0022 , + [PWRAP_DEW_CIPHER_SWRST ] =0x0024 , + [PWRAP_DEW_CIPHER_IV0 ] =0x0026 , + [PWRAP_DEW_CIPHER_IV1 ] =0x0028 , + [PWRAP_DEW_CIPHER_IV2 ] =0x002a , + [PWRAP_DEW_CIPHER_IV3 ] =0x002c , + [PWRAP_DEW_CIPHER_IV4 ] =0x002e , + [PWRAP_DEW_CIPHER_IV5 ] =0x0030 , }; static const u32 mt6323_regs[] = {
@@ -386,6 +438,22 @@ enum pwrap_regs {PWRAP_EINT_STA1_ADR ,PWRAP_SWINF_2_WDATA_31_0 ,PWRAP_SWINF_2_RDATA_31_0 , +PWRAP_DVFS_ADR0 , +PWRAP_DVFS_WDATA0 , +PWRAP_DVFS_ADR1 , +PWRAP_DVFS_WDATA1 , +PWRAP_DVFS_ADR2 , +PWRAP_DVFS_WDATA2 , +PWRAP_DVFS_ADR3 , +PWRAP_DVFS_WDATA3 , +PWRAP_DVFS_ADR4 , +PWRAP_DVFS_WDATA4 , +PWRAP_DVFS_ADR5 , +PWRAP_DVFS_WDATA5 , +PWRAP_DVFS_ADR6 , +PWRAP_DVFS_WDATA6 , +PWRAP_DVFS_ADR7 , +PWRAP_DVFS_WDATA7 ,/* MT2701 only regs */ PWRAP_ADC_CMD_ADDR,
@@ -394,6 +462,24 @@ enum pwrap_regs {PWRAP_ADC_RDATA_ADDR1 ,PWRAP_ADC_RDATA_ADDR2 , +/* MT6589 only regs */ +PWRAP_CIPHER_IV0 , +PWRAP_CIPHER_IV1 , +PWRAP_CIPHER_IV2 , + +/* MT6589 and MT8135 only regs */ +PWRAP_CSHEXT , +PWRAP_EVENT_IN_EN , +PWRAP_EVENT_DST_EN , +PWRAP_RRARB_INIT , +PWRAP_RRARB_EN , +PWRAP_RRARB_STA0 , +PWRAP_RRARB_STA1 , +PWRAP_EVENT_STA , +PWRAP_EVENT_STACLR , +PWRAP_CIPHER_LOAD , +PWRAP_CIPHER_START , +/* MT7622 only regs */ PWRAP_STA , PWRAP_CLR,
@@ -422,38 +508,9 @@ enum pwrap_regs {PWRAP_DVFS_STEP_CTRL2 ,PWRAP_SPI2_CTRL , -/* MT8135 only regs */ -PWRAP_CSHEXT , -PWRAP_EVENT_IN_EN , -PWRAP_EVENT_DST_EN , -PWRAP_RRARB_INIT , -PWRAP_RRARB_EN , -PWRAP_RRARB_STA0 , -PWRAP_RRARB_STA1 , -PWRAP_EVENT_STA , -PWRAP_EVENT_STACLR , -PWRAP_CIPHER_LOAD , -PWRAP_CIPHER_START , -/* MT8173 only regs */ PWRAP_RDDMY ,PWRAP_SI_CK_CON , -PWRAP_DVFS_ADR0 , -PWRAP_DVFS_WDATA0 , -PWRAP_DVFS_ADR1 , -PWRAP_DVFS_WDATA1 , -PWRAP_DVFS_ADR2 , -PWRAP_DVFS_WDATA2 , -PWRAP_DVFS_ADR3 , -PWRAP_DVFS_WDATA3 , -PWRAP_DVFS_ADR4 , -PWRAP_DVFS_WDATA4 , -PWRAP_DVFS_ADR5 , -PWRAP_DVFS_WDATA5 , -PWRAP_DVFS_ADR6 , -PWRAP_DVFS_WDATA6 , -PWRAP_DVFS_ADR7 , -PWRAP_DVFS_WDATA7 ,PWRAP_SPMINF_STA , PWRAP_CIPHER_EN,
@@ -569,6 +626,98 @@ static const int mt2701_regs[] = { [PWRAP_ADC_RDATA_ADDR2] = 0x154, }; +static const int mt6589_regs[] = { + [PWRAP_MUX_SEL ] =0x0 , + [PWRAP_WRAP_EN ] =0x4 , + [PWRAP_DIO_EN ] =0x8 , + [PWRAP_SIDLY ] =0xc , + [PWRAP_CSHEXT ] =0x10 , + [PWRAP_CSHEXT_WRITE ] =0x14 , + [PWRAP_CSHEXT_READ ] =0x18 , + [PWRAP_CSLEXT_START ] =0x1c , + [PWRAP_CSLEXT_END ] =0x20 , + [PWRAP_STAUPD_PRD ] =0x24 , + [PWRAP_STAUPD_GRPEN ] =0x28 , + [PWRAP_STAUPD_MAN_TRIG ] =0x2c , + [PWRAP_STAUPD_STA ] =0x30 , + [PWRAP_EVENT_IN_EN ] =0x34 , + [PWRAP_EVENT_DST_EN ] =0x38 , + [PWRAP_WRAP_STA ] =0x3c , + [PWRAP_RRARB_INIT ] =0x40 , + [PWRAP_RRARB_EN ] =0x44 , + [PWRAP_RRARB_STA0 ] =0x48 , + [PWRAP_RRARB_STA1 ] =0x4c , + [PWRAP_HARB_INIT ] =0x50 , + [PWRAP_HARB_HPRIO ] =0x54 , + [PWRAP_HIPRIO_ARB_EN ] =0x58 , + [PWRAP_HARB_STA0 ] =0x5c , + [PWRAP_HARB_STA1 ] =0x60 , + [PWRAP_MAN_EN ] =0x64 , + [PWRAP_MAN_CMD ] =0x68 , + [PWRAP_MAN_RDATA ] =0x6c , + [PWRAP_MAN_VLDCLR ] =0x70 , + [PWRAP_WACS0_EN ] =0x74 , + [PWRAP_INIT_DONE0 ] =0x78 , + [PWRAP_WACS0_CMD ] =0x7c , + [PWRAP_WACS0_RDATA ] =0x80 , + [PWRAP_WACS0_VLDCLR ] =0x84 , + [PWRAP_WACS1_EN ] =0x88 , + [PWRAP_INIT_DONE1 ] =0x8c , + [PWRAP_WACS1_CMD ] =0x90 , + [PWRAP_WACS1_RDATA ] =0x94 , + [PWRAP_WACS1_VLDCLR ] =0x98 , + [PWRAP_WACS2_EN ] =0x9c , + [PWRAP_INIT_DONE2 ] =0xa0 , + [PWRAP_WACS2_CMD ] =0xa4 , + [PWRAP_WACS2_RDATA ] =0xa8 , + [PWRAP_WACS2_VLDCLR ] =0xac , + [PWRAP_INT_EN ] =0xb0 , + [PWRAP_INT_FLG_RAW ] =0xb4 , + [PWRAP_INT_FLG ] =0xb8 , + [PWRAP_INT_CLR ] =0xbc , + [PWRAP_SIG_ADR ] =0xc0 , + [PWRAP_SIG_MODE ] =0xc4 , + [PWRAP_SIG_VALUE ] =0xc8 , + [PWRAP_SIG_ERRVAL ] =0xcc , + [PWRAP_CRC_EN ] =0xd0 , + [PWRAP_EVENT_STA ] =0xd4 , + [PWRAP_EVENT_STACLR ] =0xd8 , + [PWRAP_TIMER_EN ] =0xdc , + [PWRAP_TIMER_STA ] =0xe0 , + [PWRAP_WDT_UNIT ] =0xe4 , + [PWRAP_WDT_SRC_EN ] =0xe8 , + [PWRAP_WDT_FLG ] =0xec , + [PWRAP_DEBUG_INT_SEL ] =0xf0 , + [PWRAP_DVFS_ADR0 ] =0xf4 , + [PWRAP_DVFS_WDATA0 ] =0xf8 , + [PWRAP_DVFS_ADR1 ] =0xfc , + [PWRAP_DVFS_WDATA1 ] =0x100 , + [PWRAP_DVFS_ADR2 ] =0x104 , + [PWRAP_DVFS_WDATA2 ] =0x108 , + [PWRAP_DVFS_ADR3 ] =0x10c , + [PWRAP_DVFS_WDATA3 ] =0x110 , + [PWRAP_DVFS_ADR4 ] =0x114 , + [PWRAP_DVFS_WDATA4 ] =0x118 , + [PWRAP_DVFS_ADR5 ] =0x11c , + [PWRAP_DVFS_WDATA5 ] =0x120 , + [PWRAP_DVFS_ADR6 ] =0x124 , + [PWRAP_DVFS_WDATA6 ] =0x128 , + [PWRAP_DVFS_ADR7 ] =0x12c , + [PWRAP_DVFS_WDATA7 ] =0x130 , + [PWRAP_CIPHER_KEY_SEL ] =0x134 , + [PWRAP_CIPHER_IV_SEL ] =0x138 , + [PWRAP_CIPHER_LOAD ] =0x13c , + [PWRAP_CIPHER_START ] =0x140 , + [PWRAP_CIPHER_RDY ] =0x144 , + [PWRAP_CIPHER_MODE ] =0x148 , + [PWRAP_CIPHER_SWRST ] =0x14c , + [PWRAP_CIPHER_IV0 ] =0x150 , + [PWRAP_CIPHER_IV1 ] =0x154 , + [PWRAP_CIPHER_IV2 ] =0x158 , + [PWRAP_DCM_EN ] =0x15c , + [PWRAP_DCM_DBC_PRD ] =0x160 , +}; +static const int mt6765_regs[] = { [PWRAP_MUX_SEL ] =0x0 , [PWRAP_WRAP_EN ] =0x4 ,
@@ -1301,6 +1450,7 @@ static const int mt8186_regs[] = { };enum pmic_type { +PMIC_MT6320 ,PMIC_MT6323 ,PMIC_MT6331 ,PMIC_MT6332 ,
@@ -1314,6 +1464,7 @@ enum pmic_type {enum pwrap_type {PWRAP_MT2701 , +PWRAP_MT6589 ,PWRAP_MT6765 ,PWRAP_MT6779 ,PWRAP_MT6795 ,
@@ -1750,6 +1901,7 @@ static int pwrap_common_init_reg_clock(struct pmic_wrapper *wrp)case PWRAP_MT8173 :pwrap_init_chip_select_ext (wrp,0 ,4 ,2 ,2 );break ; +case PWRAP_MT6589 :case PWRAP_MT8135 :pwrap_writel (wrp,0x4 ,PWRAP_CSHEXT );pwrap_init_chip_select_ext (wrp,0 ,4 ,0 ,0 );
@@ -1834,6 +1986,7 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp)pwrap_writel (wrp,0x2 ,PWRAP_CIPHER_IV_SEL );switch (wrp->master->type) { +case PWRAP_MT6589 :case PWRAP_MT8135 :pwrap_writel (wrp,1 ,PWRAP_CIPHER_LOAD );pwrap_writel (wrp,1 ,PWRAP_CIPHER_START );
@@ -1866,6 +2019,7 @@ static int pwrap_init_cipher(struct pmic_wrapper *wrp)pwrap_config_cipher (wrp, wrp->slave->comp_dew_regs);switch (wrp->slave->type) { +case PMIC_MT6320 :case PMIC_MT6397 :pwrap_write (wrp, wrp->slave->dew_regs[PWRAP_DEW_CIPHER_LOAD ],0x1 );
@@ -1960,13 +2114,13 @@ static int pwrap_mt8135_init_soc_specific(struct pmic_wrapper *wrp)/* enable pwrap events and pwrap bridge in AP side */ pwrap_writel (wrp,0x1 ,PWRAP_EVENT_IN_EN );pwrap_writel (wrp,0xffff ,PWRAP_EVENT_DST_EN ); -writel (0x7f , wrp->bridge_base +PWRAP_MT8135_BRIDGE_IORD_ARB_EN ); -writel (0x1 , wrp->bridge_base +PWRAP_MT8135_BRIDGE_WACS3_EN ); -writel (0x1 , wrp->bridge_base +PWRAP_MT8135_BRIDGE_WACS4_EN ); -writel (0x1 , wrp->bridge_base +PWRAP_MT8135_BRIDGE_WDT_UNIT ); -writel (0xffff , wrp->bridge_base +PWRAP_MT8135_BRIDGE_WDT_SRC_EN ); -writel (0x1 , wrp->bridge_base +PWRAP_MT8135_BRIDGE_TIMER_EN ); -writel (0x7ff , wrp->bridge_base +PWRAP_MT8135_BRIDGE_INT_EN ); +writel (0x7f , wrp->bridge_base +PWRAP_BRIDGE_IORD_ARB_EN ); +writel (0x1 , wrp->bridge_base +PWRAP_BRIDGE_WACS3_EN ); +writel (0x1 , wrp->bridge_base +PWRAP_BRIDGE_WACS4_EN ); +writel (0x1 , wrp->bridge_base +PWRAP_BRIDGE_WDT_UNIT ); +writel (0xffff , wrp->bridge_base +PWRAP_BRIDGE_WDT_SRC_EN ); +writel (0x1 , wrp->bridge_base +PWRAP_BRIDGE_TIMER_EN ); +writel (0x7ff , wrp->bridge_base +PWRAP_BRIDGE_INT_EN );/* enable PMIC event out and sources */ if (pwrap_write(wrp, wrp->slave->dew_regs[PWRAP_DEW_EVENT_OUT_EN],
@@ -2110,7 +2264,8 @@ static int pwrap_init(struct pmic_wrapper *wrp)return ret; } -if (wrp->master->type ==PWRAP_MT8135 ) +if (wrp->master->type ==PWRAP_MT8135 || + wrp->master->type ==PWRAP_MT6589 )pwrap_writel (wrp,0x7 ,PWRAP_RRARB_EN );pwrap_writel (wrp,0x1 ,PWRAP_WACS0_EN );
@@ -2131,8 +2286,8 @@ static int pwrap_init(struct pmic_wrapper *wrp)pwrap_writel (wrp,1 ,PWRAP_INIT_DONE1 );if (HAS_CAP (wrp->master->caps,PWRAP_CAP_BRIDGE )) { -writel (1 , wrp->bridge_base +PWRAP_MT8135_BRIDGE_INIT_DONE3 ); -writel (1 , wrp->bridge_base +PWRAP_MT8135_BRIDGE_INIT_DONE4 ); +writel (1 , wrp->bridge_base +PWRAP_BRIDGE_INIT_DONE3 ); +writel (1 , wrp->bridge_base +PWRAP_BRIDGE_INIT_DONE4 ); }return 0 ;
@@ -2186,6 +2341,14 @@ static const struct pwrap_slv_regops pwrap_regops32 = { .regmap = &pwrap_regmap_config32, }; +static const struct pwrap_slv_type pmic_mt6320 = { + .dew_regs = mt6320_regs, + .type =PMIC_MT6320 , + .regops = &pwrap_regops16, + .caps =PWRAP_SLV_CAP_SPI |PWRAP_DEW_DIO_EN | +PWRAP_SLV_CAP_SECURITY , +}; +static const struct pwrap_slv_type pmic_mt6323 = { .dew_regs = mt6323_regs, .type =PMIC_MT6323 ,
@@ -2248,6 +2411,7 @@ static const struct pwrap_slv_type pmic_mt6397 = { };static const struct of_device_id of_slave_match_tbl[] = { + { .compatible ="mediatek,mt6320" , .data = &pmic_mt6320 }, { .compatible ="mediatek,mt6323" , .data = &pmic_mt6323 }, { .compatible ="mediatek,mt6331" , .data = &pmic_mt6331 }, { .compatible ="mediatek,mt6351" , .data = &pmic_mt6351 },
@@ -2277,6 +2441,19 @@ static const struct pmic_wrapper_type pwrap_mt2701 = { .init_soc_specific = pwrap_mt2701_init_soc_specific, }; +static const struct pmic_wrapper_type pwrap_mt6589 = { + .regs = mt6589_regs, + .type =PWRAP_MT6589 , + .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_BRIDGE |PWRAP_CAP_RESET |PWRAP_CAP_DCM , + .init_reg_clock = pwrap_common_init_reg_clock, + .init_soc_specific = pwrap_mt8135_init_soc_specific, +}; +static const struct pmic_wrapper_type pwrap_mt6765 = { .regs = mt6765_regs, .type =PWRAP_MT6765 ,
@@ -2446,6 +2623,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,mt6589-pwrap" , .data = &pwrap_mt6589 }, { .compatible ="mediatek,mt6765-pwrap" , .data = &pwrap_mt6765 }, { .compatible ="mediatek,mt6779-pwrap" , .data = &pwrap_mt6779 }, { .compatible ="mediatek,mt6795-pwrap" , .data = &pwrap_mt6795 },
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH 3/3] soc: mediatek: pwrap: add MT6589 PWARP and MT6320 PMIC support
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] Incorrect capability flag used for MT6320 PMIC: `PWRAP_DEW_DIO_EN` is used instead of…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] Incorrect capability flag used for MT6320 PMIC: PWRAP_DEW_DIO_EN is used instead of PWRAP_SLV_CAP_DUALIO, silently disabling Dual I/O mode. --
--- Patch [3]: [PATCH 3/3] soc: mediatek: pwrap: add MT6589 PWARP and MT6320 PMIC support --- commit 69d3d2c2fbeaf34ea620f48758fb711a4ca760f9
Author: Akari Tsuyukusa <[email protected]>
soc: mediatek: pwrap: add MT6589 PWARP and MT6320 PMIC support
This commit adds support for the MediaTek MT6589 PWRAP and MT6320 PMIC. It also refactors the existing MT8135 bridge register definitions to use a generic prefix.
Quoted 4 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +0
-0
[ ... ]
drivers/soc/mediatek/mtk-pmic-wrap.c static const struct pwrap_slv_regops pwrap_regops32 = { · line 2348
Quoted 9 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +5
-0@@ -2186,6 +2341,14 @@ static const struct pwrap_slv_regops pwrap_regops32 = { .regmap = &pwrap_regmap_config32, }; +static const struct pwrap_slv_type pmic_mt6320 = { + .dew_regs = mt6320_regs, + .type =PMIC_MT6320 , + .regops = &pwrap_regops16, + .caps = PWRAP_SLV_CAP_SPI | PWRAP_DEW_DIO_EN |
[Severity: Medium]
Does using PWRAP_DEW_DIO_EN here instead of PWRAP_SLV_CAP_DUALIO accidentally disable Dual I/O mode?
PWRAP_DEW_DIO_EN is an enumeration value for a register index that evaluates to 1 (since PWRAP_DEW_BASE is 0). PWRAP_SLV_CAP_SPI is BIT(0), which also equals 1. Bitwise ORing them together results in a bitmask that completely omits the intended Dual I/O capability, as PWRAP_SLV_CAP_DUALIO is BIT(1).
This causes HAS_CAP(wrp->slave->caps, PWRAP_SLV_CAP_DUALIO) to evaluate to false during pwrap_init(), skipping pwrap_init_dual_io() and leaving the PMIC wrapper in single I/O SPI mode.
Quoted 6 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +3
-0+ PWRAP_SLV_CAP_SECURITY, +}; +static const struct pwrap_slv_type pmic_mt6323 = { .dew_regs = mt6323_regs, .type =PMIC_MT6323 ,
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Re: [PATCH 3/3] soc: mediatek: pwrap: add MT6589 PWARP and MT6320 PMIC support
Quoted 5 lines · On Fri, Jul 17, 2026 at 2:27 AM <[email protected]> wrote:
[Severity: Medium]
Does usingPWRAP_DEW_DIO_ENhere instead ofPWRAP_SLV_CAP_DUALIOaccidentally
disable Dual I/O mode?
--
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
100% correct review, I'll fix in v2.
AngeloGioacchino Del Regno
maintainerRe: [PATCH 3/3] soc: mediatek: pwrap: add MT6589 PWARP and MT6320 PMIC support
In reply to Akari TsuyukusaQuoted 22 lines · Akari Tsuyukusa
Add support for MediaTek MT6589 PWRAP and MT6320 PMIC which are used together.
Since the PWRAP Bridge hardware on MT6589 is identical to the one on MT8135, refactor the existing register definitions:
- Rename the MT8135-specific "PWRAP_MT8135_BRIDGE_" prefix to a generic "PWRAP_BRIDGE_" prefix to reflect that they are shared across SoCs.
- Add the full set of PWRAP Bridge registers to match the hardware specification, rather than defining only a subset of them.Signed-off-by Akari Tsuyukusa <[email protected]>--- drivers/soc/mediatek/mtk-pmic-wrap.c | 292 +++++++++++++++++++++------ 1 file changed, 235 insertions(+), 57 deletions(-)drivers/soc/mediatek/mtk-pmic-wrap.c +0
-0@@ -17,15 +17,31 @@#define PWRAP_POLL_DELAY_US 10#define PWRAP_POLL_TIMEOUT_US 10000
drivers/soc/mediatek/mtk-pmic-wrap.c line 28
Quoted 10 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +0
-9-#define PWRAP_MT8135_BRIDGE_IORD_ARB_EN 0x4 -#define PWRAP_MT8135_BRIDGE_WACS3_EN 0x10 -#define PWRAP_MT8135_BRIDGE_INIT_DONE3 0x14 -#define PWRAP_MT8135_BRIDGE_WACS4_EN 0x24 -#define PWRAP_MT8135_BRIDGE_INIT_DONE4 0x28 -#define PWRAP_MT8135_BRIDGE_INT_EN 0x38 -#define PWRAP_MT8135_BRIDGE_TIMER_EN 0x48 -#define PWRAP_MT8135_BRIDGE_WDT_UNIT 0x50 -#define PWRAP_MT8135_BRIDGE_WDT_SRC_EN 0x54
Yeah I understand why you're renaming those, but choose:
a. You avoid renaming and add the rest as PWRAP_MT8135_XXXX; or b. You make two commits, one for the rename (and explaining why) and one
for introducing MT6589 support.
Your choice.
Quoted 152 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +104
-12+/* MT6589 and MT8135 specific PWARP Bridge registers */ +#define PWRAP_BRIDGE_IARB_INIT 0x0 +#define PWRAP_BRIDGE_IORD_ARB_EN 0x4 +#define PWRAP_BRIDGE_IARB_STA0 0x8 +#define PWRAP_BRIDGE_IARB_STA1 0xc +#define PWRAP_BRIDGE_WACS3_EN 0x10 +#define PWRAP_BRIDGE_INIT_DONE3 0x14 +#define PWRAP_BRIDGE_WACS3_CMD 0x18 +#define PWRAP_BRIDGE_WACS3_RDATA 0x1c +#define PWRAP_BRIDGE_WACS3_VLDCLR 0x20 +#define PWRAP_BRIDGE_WACS4_EN 0x24 +#define PWRAP_BRIDGE_INIT_DONE4 0x28 +#define PWRAP_BRIDGE_WACS4_CMD 0x2c +#define PWRAP_BRIDGE_WACS4_RDATA 0x30 +#define PWRAP_BRIDGE_WACS4_VLDCLR 0x34 +#define PWRAP_BRIDGE_INT_EN 0x38 +#define PWRAP_BRIDGE_INT_FLG_RAW 0x3c +#define PWRAP_BRIDGE_INT_FLG 0x40 +#define PWRAP_BRIDGE_INT_CLR 0x44 +#define PWRAP_BRIDGE_TIMER_EN 0x48 +#define PWRAP_BRIDGE_TIMER_STA 0x4c +#define PWRAP_BRIDGE_WDT_UNIT 0x50 +#define PWRAP_BRIDGE_WDT_SRC_EN 0x54 +#define PWRAP_BRIDGE_WDT_FLG 0x58 +#define PWRAP_BRIDGE_DEBUG_INT_SEL 0x5c/* macro for wrapper status */ #define PWRAP_GET_WACS_RDATA (x) (((x) >> 0) & 0x0000ffff)@@ -100,6 +116,24 @@ enum dew_regs {PWRAP_DEW_CIPHER_MODE ,PWRAP_DEW_CIPHER_SWRST , +/* MT6320 only regs */ +PWRAP_DEW_CIPHER_IV0 , +PWRAP_DEW_CIPHER_IV1 , +PWRAP_DEW_CIPHER_IV2 , +PWRAP_DEW_CIPHER_IV3 , +PWRAP_DEW_CIPHER_IV4 , +PWRAP_DEW_CIPHER_IV5 , + +/* MT6320 and MT6397 only regs */ +PWRAP_DEW_EVENT_OUT_EN , +PWRAP_DEW_EVENT_SRC_EN , +PWRAP_DEW_EVENT_SRC , +PWRAP_DEW_EVENT_FLAG , +PWRAP_DEW_MON_FLAG_SEL , +PWRAP_DEW_EVENT_TEST , +PWRAP_DEW_CIPHER_LOAD , +PWRAP_DEW_CIPHER_START , +/* MT6323 only regs */ PWRAP_DEW_CIPHER_EN , PWRAP_DEW_RDDMY_NO,@@ -142,16 +176,34 @@ enum dew_regs {PWRAP_DEW_RG_WDATA_MASK ,PWRAP_DEW_RG_SPI_RECORD_CLR , PWRAP_DEW_RG_CMD_ALERT_CLR, +}; -/* MT6397 only regs */ -PWRAP_DEW_EVENT_OUT_EN , -PWRAP_DEW_EVENT_SRC_EN , -PWRAP_DEW_EVENT_SRC , -PWRAP_DEW_EVENT_FLAG , -PWRAP_DEW_MON_FLAG_SEL , -PWRAP_DEW_EVENT_TEST , -PWRAP_DEW_CIPHER_LOAD , - PWRAP_DEW_CIPHER_START, +static const u32 mt6320_regs[] = { + [PWRAP_DEW_EVENT_OUT_EN ] =0x0000 , + [PWRAP_DEW_DIO_EN ] =0x0002 , + [PWRAP_DEW_EVENT_SRC_EN ] =0x0004 , + [PWRAP_DEW_EVENT_SRC ] =0x0006 , + [PWRAP_DEW_EVENT_FLAG ] =0x0008 , + [PWRAP_DEW_READ_TEST ] =0x000a , + [PWRAP_DEW_WRITE_TEST ] =0x000c , + [PWRAP_DEW_CRC_EN ] =0x000e , + [PWRAP_DEW_CRC_VAL ] =0x0010 , + [PWRAP_DEW_MON_GRP_SEL ] =0x0012 , + [PWRAP_DEW_MON_FLAG_SEL ] =0x0014 , + [PWRAP_DEW_EVENT_TEST ] =0x0016 , + [PWRAP_DEW_CIPHER_KEY_SEL ] =0x0018 , + [PWRAP_DEW_CIPHER_IV_SEL ] =0x001a , + [PWRAP_DEW_CIPHER_LOAD ] =0x001c , + [PWRAP_DEW_CIPHER_START ] =0x001e , + [PWRAP_DEW_CIPHER_RDY ] =0x0020 , + [PWRAP_DEW_CIPHER_MODE ] =0x0022 , + [PWRAP_DEW_CIPHER_SWRST ] =0x0024 , + [PWRAP_DEW_CIPHER_IV0 ] =0x0026 , + [PWRAP_DEW_CIPHER_IV1 ] =0x0028 , + [PWRAP_DEW_CIPHER_IV2 ] =0x002a , + [PWRAP_DEW_CIPHER_IV3 ] =0x002c , + [PWRAP_DEW_CIPHER_IV4 ] =0x002e , + [PWRAP_DEW_CIPHER_IV5 ] =0x0030 , }; static const u32 mt6323_regs[] = {@@ -386,6 +438,22 @@ enum pwrap_regs {PWRAP_EINT_STA1_ADR ,PWRAP_SWINF_2_WDATA_31_0 ,PWRAP_SWINF_2_RDATA_31_0 , +PWRAP_DVFS_ADR0 , +PWRAP_DVFS_WDATA0 , +PWRAP_DVFS_ADR1 , +PWRAP_DVFS_WDATA1 , +PWRAP_DVFS_ADR2 , +PWRAP_DVFS_WDATA2 , +PWRAP_DVFS_ADR3 , +PWRAP_DVFS_WDATA3 , +PWRAP_DVFS_ADR4 , +PWRAP_DVFS_WDATA4 , +PWRAP_DVFS_ADR5 , +PWRAP_DVFS_WDATA5 , +PWRAP_DVFS_ADR6 , +PWRAP_DVFS_WDATA6 , +PWRAP_DVFS_ADR7 , +PWRAP_DVFS_WDATA7 ,/* MT2701 only regs */ PWRAP_ADC_CMD_ADDR,@@ -394,6 +462,24 @@ enum pwrap_regs {PWRAP_ADC_RDATA_ADDR1 ,PWRAP_ADC_RDATA_ADDR2 , +/* MT6589 only regs */ +PWRAP_CIPHER_IV0 , +PWRAP_CIPHER_IV1 , +PWRAP_CIPHER_IV2 , + +/* MT6589 and MT8135 only regs */ +PWRAP_CSHEXT , +PWRAP_EVENT_IN_EN , +PWRAP_EVENT_DST_EN , +PWRAP_RRARB_INIT , +PWRAP_RRARB_EN , +PWRAP_RRARB_STA0 , +PWRAP_RRARB_STA1 , +PWRAP_EVENT_STA , +PWRAP_EVENT_STACLR , +PWRAP_CIPHER_LOAD , +PWRAP_CIPHER_START , +/* MT7622 only regs */ PWRAP_STA , PWRAP_CLR,@@ -422,38 +508,9 @@ enum pwrap_regs {PWRAP_DVFS_STEP_CTRL2 , PWRAP_SPI2_CTRL, -/* MT8135 only regs */ -PWRAP_CSHEXT , - PWRAP_EVENT_IN_EN,
drivers/soc/mediatek/mtk-pmic-wrap.c enum pwrap_regs { · line 437
Quoted 10 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +0
-10-PWRAP_EVENT_DST_EN , -PWRAP_RRARB_INIT , -PWRAP_RRARB_EN , -PWRAP_RRARB_STA0 , -PWRAP_RRARB_STA1 , -PWRAP_EVENT_STA , -PWRAP_EVENT_STACLR , -PWRAP_CIPHER_LOAD , - PWRAP_CIPHER_START, -
Why are you reordering stuff around? I don't understand.
If you have a reason, make sure it's a good one, and make a different commit just for the reordering, because otherwise the diff for this one gets a bit hard to read.
Cheers,
Angelo
Quoted 21 lines
drivers/soc/mediatek/mtk-pmic-wrap.c +0
-16/* MT8173 only regs */ PWRAP_RDDMY ,PWRAP_SI_CK_CON , -PWRAP_DVFS_ADR0 , -PWRAP_DVFS_WDATA0 , -PWRAP_DVFS_ADR1 , -PWRAP_DVFS_WDATA1 , -PWRAP_DVFS_ADR2 , -PWRAP_DVFS_WDATA2 , -PWRAP_DVFS_ADR3 , -PWRAP_DVFS_WDATA3 , -PWRAP_DVFS_ADR4 , -PWRAP_DVFS_WDATA4 , -PWRAP_DVFS_ADR5 , -PWRAP_DVFS_WDATA5 , -PWRAP_DVFS_ADR6 , -PWRAP_DVFS_WDATA6 , -PWRAP_DVFS_ADR7 , -PWRAP_DVFS_WDATA7 ,PWRAP_SPMINF_STA , PWRAP_CIPHER_EN,
[PATCH 3/3] has a bug, I'll fix in v2.
Please ignore this series for now.