Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 14:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mfd: twl: Fix TWL6032 phy vbus detection

Browse Source 
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
This commit is contained in:
Andreas Kemnade 2022-12-08 22:57:23 +01:00 committed by Lee Jones
parent 8b450dcff2
commit ccc91b3ed3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mfd/twl-core.c
View File

@ -110,8 +110,8 @@
#define TWL6030_BASEADD_PWM 0x00BA #define TWL6030_BASEADD_PWM 0x00BA
#define TWL6030_BASEADD_GASGAUGE 0x00C0 #define TWL6030_BASEADD_GASGAUGE 0x00C0
#define TWL6030_BASEADD_PIH 0x00D0 #define TWL6030_BASEADD_PIH 0x00D0
#define TWL6030_BASEADD_CHARGER 0x00E0
#define TWL6032_BASEADD_CHARGER 0x00DA #define TWL6032_BASEADD_CHARGER 0x00DA
#define TWL6030_BASEADD_CHARGER 0x00E0
#define TWL6030_BASEADD_LED 0x00F4 #define TWL6030_BASEADD_LED 0x00F4
/* subchip/slave 2 0x4A - DFT */ /* subchip/slave 2 0x4A - DFT */
@ -353,6 +353,9 @@ static struct twl_mapping twl6030_map[] = {
{ 2, TWL6030_BASEADD_ZERO }, { 2, TWL6030_BASEADD_ZERO },
{ 1, TWL6030_BASEADD_GPADC_CTRL }, { 1, TWL6030_BASEADD_GPADC_CTRL },
{ 1, TWL6030_BASEADD_GASGAUGE }, { 1, TWL6030_BASEADD_GASGAUGE },
/* TWL6032 specific charger registers */
{ 1, TWL6032_BASEADD_CHARGER },
}; };
static const struct regmap_config twl6030_regmap_config[3] = { 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) { if ((id->driver_data) & TWL6030_CLASS) {
twl_priv->twl_id = TWL6030_CLASS_ID; twl_priv->twl_id = TWL6030_CLASS_ID;
twl_priv->twl_map = &twl6030_map[0]; 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; twl_regmap_config = twl6030_regmap_config;
} else { } else {
twl_priv->twl_id = TWL4030_CLASS_ID; twl_priv->twl_id = TWL4030_CLASS_ID;

2
include/linux/mfd/twl.h
View File

@ -69,6 +69,8 @@ enum twl6030_module_ids {
TWL6030_MODULE_GPADC, TWL6030_MODULE_GPADC,
TWL6030_MODULE_GASGAUGE, TWL6030_MODULE_GASGAUGE,
/* A few extra registers before the registers shared with the 6030 */
TWL6032_MODULE_CHARGE,
TWL6030_MODULE_LAST, TWL6030_MODULE_LAST,
}; };