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.

Cc: Bin Liu <b-liu@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221208215723.217557-1-andreas@kemnade.info

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 62be2326c9b204c673ff94d4441209d3934cc853..e2d9a93be43bf03be8e84353e632267669330d57 100644 (file)
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -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] = {
@@ -803,10 +806,6 @@ twl_probe(struct i2c_client *client)
        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;

diff --git a/include/linux/mfd/twl.h b/include/linux/mfd/twl.h
index eaa233038254633448645505fc8cf01298bf6a56..6e3d99b7a0ee65f8c6b102aea2e701c945acf83b 100644 (file)
--- a/include/linux/mfd/twl.h
+++ b/include/linux/mfd/twl.h
@@ -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,
 };