mfd: mt6397: Properly fix CID of MT6328, MT6331 and MT6332
Subsystems (2)
PATCH 1/1 mfd: mt6397: Properly fix CID of MT6328, MT6331 and MT6332
CIDs set for MT6328, MT6331 and MT6332 are not appropriate. Many Android downstream kernels define CID as below,
MT6328:
#define PMIC6328_E1_CID_CODE 0x2810
#define PMIC6328_E2_CID_CODE 0x2820
#define PMIC6328_E3_CID_CODE 0x2830MT6331/MT6332:
#define PMIC6331_E1_CID_CODE 0x3110
#define PMIC6331_E2_CID_CODE 0x3120
#define PMIC6331_E3_CID_CODE 0x3130 #define PMIC6332_E1_CID_CODE 0x3210
#define PMIC6332_E2_CID_CODE 0x3220
#define PMIC6332_E3_CID_CODE 0x3230The current configuration incorrectly uses the revision code as the CID. Therefore, the driver cannot detect the same PMIC of different revisions. (E1/E2 for MT6328, E1/E3 for MT6331/MT6332)
Based on these, the CID of MT6328, MT6331 and MT6332 should be corrected.
Additionally, the incorrect MT6331/MT6332 CID overlaps with the MT6320's actual CID:
#define PMIC6320_E1_CID_CODE 0x1020
#define PMIC6320_E2_CID_CODE 0x2020This causes a conflict in the switch-case statement of mt6397-irq.c, this prevents adding support for MT6320.
--- drivers/mfd/mt6397-core.c | 4 ++-- include/linux/mfd/mt6397/core.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/mt6397-core.c +2 -2
@@ -297,7 +297,7 @@ static const struct chip_data mt6323_core = {static const struct chip_data mt6328_core = { .cid_addr =MT6328_HWCID , - .cid_shift =0 , + .cid_shift =8 , .cells = mt6328_devs, .cell_size =ARRAY_SIZE (mt6328_devs), .irq_init = mt6397_irq_init,
@@ -313,7 +313,7 @@ static const struct chip_data mt6357_core = {static const struct chip_data mt6331_mt6332_core = { .cid_addr =MT6331_HWCID , - .cid_shift =0 , + .cid_shift =8 , .cells = mt6331_mt6332_devs, .cell_size =ARRAY_SIZE (mt6331_mt6332_devs), .irq_init = mt6397_irq_init,
include/linux/mfd/mt6397/core.h +3 -3
@@ -12,9 +12,9 @@enum chip_id {MT6323_CHIP_ID =0x23 , -MT6328_CHIP_ID =0x30 , -MT6331_CHIP_ID =0x20 , -MT6332_CHIP_ID =0x20 , +MT6328_CHIP_ID =0x28 , +MT6331_CHIP_ID =0x31 , +MT6332_CHIP_ID =0x32 ,MT6357_CHIP_ID =0x57 ,MT6358_CHIP_ID =0x58 ,MT6359_CHIP_ID =0x59 ,
Signature · 1 line
2.52.0
Il 28/02/26 20:08, Akari Tsuyukusa ha scritto:
Quoted 30 lines
CIDs set for MT6328, MT6331 and MT6332 are not appropriate. Many Android downstream kernels define CID as below,
MT6328:
#define PMIC6328_E1_CID_CODE 0x2810 #define PMIC6328_E2_CID_CODE 0x2820 #define PMIC6328_E3_CID_CODE 0x2830MT6331/MT6332:
#define PMIC6331_E1_CID_CODE 0x3110 #define PMIC6331_E2_CID_CODE 0x3120 #define PMIC6331_E3_CID_CODE 0x3130#define PMIC6332_E1_CID_CODE 0x3210 #define PMIC6332_E2_CID_CODE 0x3220 #define PMIC6332_E3_CID_CODE 0x3230The current configuration incorrectly uses the revision code as the CID. Therefore, the driver cannot detect the same PMIC of different revisions. (E1/E2 for MT6328, E1/E3 for MT6331/MT6332)
Based on these, the CID of MT6328, MT6331 and MT6332 should be corrected.Additionally, the incorrect MT6331/MT6332 CID overlaps with the MT6320's actual CID:
#define PMIC6320_E1_CID_CODE 0x1020 #define PMIC6320_E2_CID_CODE 0x2020
Quoted 6 lines
This causes a conflict in the switch-case statement of
mt6397-irq.c, this prevents adding support for MT6320.
Please remove these links, these will be invalid in a few months, so they are irrelevant.
Quoted 1 line
Signed-off-by Akari Tsuyukusa <[email protected]>
Anyway:
Cheers,
Angelo
PATCH v2 1/1 mfd: mt6397: Properly fix CID of MT6328, MT6331 and MT6332
In reply to Akari TsuyukusaCIDs set for MT6328, MT6331 and MT6332 are not appropriate. Many Android downstream kernels define CID as below,
MT6328:
#define PMIC6328_E1_CID_CODE 0x2810
#define PMIC6328_E2_CID_CODE 0x2820
#define PMIC6328_E3_CID_CODE 0x2830MT6331/MT6332:
#define PMIC6331_E1_CID_CODE 0x3110
#define PMIC6331_E2_CID_CODE 0x3120
#define PMIC6331_E3_CID_CODE 0x3130 #define PMIC6332_E1_CID_CODE 0x3210
#define PMIC6332_E2_CID_CODE 0x3220
#define PMIC6332_E3_CID_CODE 0x3230The current configuration incorrectly uses the revision code as the CID. Therefore, the driver cannot detect the same PMIC of different revisions. (E1/E2 for MT6328, E1/E3 for MT6331/MT6332)
Based on these, the CID of MT6328, MT6331 and MT6332 should be corrected.
Additionally, the incorrect MT6331/MT6332 CID overlaps with the MT6320's actual CID:
#define PMIC6320_E1_CID_CODE 0x1020
#define PMIC6320_E2_CID_CODE 0x2020This causes a conflict in the switch-case statement of mt6397-irq.c, this prevents adding support for MT6320.
---
Changes in v2:
- Remove GitHub links from the commit message as they may become invalid. (Requested by Angelo)
- Add Reviewed-by tag.
- No code changes.
drivers/mfd/mt6397-core.c | 4 ++-- include/linux/mfd/mt6397/core.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/mt6397-core.c +2 -2
@@ -297,7 +297,7 @@ static const struct chip_data mt6323_core = {static const struct chip_data mt6328_core = { .cid_addr =MT6328_HWCID , - .cid_shift =0 , + .cid_shift =8 , .cells = mt6328_devs, .cell_size =ARRAY_SIZE (mt6328_devs), .irq_init = mt6397_irq_init,
@@ -313,7 +313,7 @@ static const struct chip_data mt6357_core = {static const struct chip_data mt6331_mt6332_core = { .cid_addr =MT6331_HWCID , - .cid_shift =0 , + .cid_shift =8 , .cells = mt6331_mt6332_devs, .cell_size =ARRAY_SIZE (mt6331_mt6332_devs), .irq_init = mt6397_irq_init,
include/linux/mfd/mt6397/core.h +3 -3
@@ -12,9 +12,9 @@enum chip_id {MT6323_CHIP_ID =0x23 , -MT6328_CHIP_ID =0x30 , -MT6331_CHIP_ID =0x20 , -MT6332_CHIP_ID =0x20 , +MT6328_CHIP_ID =0x28 , +MT6331_CHIP_ID =0x31 , +MT6332_CHIP_ID =0x32 ,MT6357_CHIP_ID =0x57 ,MT6358_CHIP_ID =0x58 ,MT6359_CHIP_ID =0x59 ,
Signature · 1 line
2.52.0
Re: (subset) [PATCH v2] mfd: mt6397: Properly fix CID of MT6328, MT6331 and MT6332
Quoted 10 lines · Akari Tsuyukusa
CIDs set for MT6328, MT6331 and MT6332 are not appropriate. Many Android downstream kernels define CID as below,
MT6328:
#define PMIC6328_E1_CID_CODE 0x2810 #define PMIC6328_E2_CID_CODE 0x2820 #define PMIC6328_E3_CID_CODE 0x2830[...]
Applied, thanks!
[1/1] mfd: mt6397: Properly fix CID of MT6328, MT6331 and MT6332
commit: f59b2bc3e6dbcd75c53f1881c1f08a6d3c2a72e5
--
Lee Jones [李琼斯]