Skip to contentSkip to conversation

mfd: twl: fix TWL6032 phy vbus detection

PATCH Applied Andreas Kemnade 2 participants 2 messages Dec 8, 2022 – Jan 4, 2023

Subsystems (2)
lore
Share & tools
lore

Andreas Kemnade

author maintainer
#0 lore raw

PATCH v2 1/1 mfd: twl: fix TWL6032 phy vbus detection

TWL6032 has a few charging registers prepended before the charging registers the TWL6030 has. To be able to use common register defines declare the additional registers as additional module.
At the moment this affects the access to CHARGERUSB_CTRL1 in phy-twl6030-usb. Without this patch, it is accessing the wrong register on TWL6032.
The consequence is that presence of Vbus is not reported.

---
Changes in v2:
- remove comment

 drivers/mfd/twl-core.c  | 9 ++++-----
 include/linux/mfd/twl.h | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/mfd/twl-core.c +4 -5
index f6b4b9d94bbd..240e63949e10 100644
@@ -110,8 +110,8 @@
 #define TWL6030_BASEADD_PWM		0x00BA
 #define TWL6030_BASEADD_GASGAUGE	0x00C0
 #define TWL6030_BASEADD_PIH		0x00D0
-#define TWL6030_BASEADD_CHARGER		0x00E0
 #define TWL6032_BASEADD_CHARGER		0x00DA
+#define TWL6030_BASEADD_CHARGER		0x00E0
 #define TWL6030_BASEADD_LED		0x00F4
 
 /* subchip/slave 2 0x4A - DFT */
@@ -353,6 +353,9 @@ static struct twl_mapping twl6030_map[] = {
 	{ 2, TWL6030_BASEADD_ZERO },
 	{ 1, TWL6030_BASEADD_GPADC_CTRL },
 	{ 1, TWL6030_BASEADD_GASGAUGE },
+
+	/* TWL6032 specific charger registers */
+	{ 1, TWL6032_BASEADD_CHARGER },
 };
 
 static const struct regmap_config twl6030_regmap_config[3] = {
@@ -802,10 +805,6 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	if ((id->driver_data) & TWL6030_CLASS) {
 		twl_priv->twl_id = TWL6030_CLASS_ID;
 		twl_priv->twl_map = &twl6030_map[0];
-		/* The charger base address is different in twl6032 */
-		if ((id->driver_data) & TWL6032_SUBCLASS)
-			twl_priv->twl_map[TWL_MODULE_MAIN_CHARGE].base =
-							TWL6032_BASEADD_CHARGER;
 		twl_regmap_config = twl6030_regmap_config;
 	} else {
 		twl_priv->twl_id = TWL4030_CLASS_ID;
include/linux/mfd/twl.h +2 -0
index eaa233038254..6e3d99b7a0ee 100644
@@ -69,6 +69,8 @@ enum twl6030_module_ids {
 	TWL6030_MODULE_GPADC,
 	TWL6030_MODULE_GASGAUGE,
 
+	/* A few extra registers before the registers shared with the 6030 */
+	TWL6032_MODULE_CHARGE,
 	TWL6030_MODULE_LAST,
 };
 
Signature · 1 line
2.30.2
maintainer Applied
#1 lore raw
Quoted 11 lines · Andreas Kemnade

TWL6032 has a few charging registers prepended before the charging registers the TWL6030 has. To be able to use common register defines declare the additional registers as additional module.
At the moment this affects the access to CHARGERUSB_CTRL1 in phy-twl6030-usb. Without this patch, it is accessing the wrong register on TWL6032.
The consequence is that presence of Vbus is not reported.

Quoted 6 lines

---
Changes in v2:
- remove comment

 drivers/mfd/twl-core.c  | 9 ++++-----
 include/linux/mfd/twl.h | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

Applied, thanks

Signature · 1 line
Lee Jones [李琼斯]