Building upon the newly added extcon detection support, add detection
for USB OTG cables (EXTCON_USB_HOST type), and enable/disable the OTG
bits as needed.
Acked-by: Lee Jones <lee@xxxxxxxxxx>
Tested-by: Henrik Grimler <henrik@xxxxxxxxxx>
Signed-off-by: Artur Weber <aweber.kernel@xxxxxxxxx>
---
Changes in v3:
- Dropped CHARGER regulator in favor of enabling charging directly
Changes in v2:
- Added CHGIN OTG current limit value
- Squashed MFD header register changes into this commit
---
drivers/power/supply/max77693_charger.c | 53 ++++++++++++++++++++++++++-------
include/linux/mfd/max77693-private.h | 5 ++++
2 files changed, 48 insertions(+), 10 deletions(-)
diff --git a/drivers/power/supply/max77693_charger.c b/drivers/power/supply/max77693_charger.c
index d67857d2aa0b..bf156544fe1b 100644
--- a/drivers/power/supply/max77693_charger.c
+++ b/drivers/power/supply/max77693_charger.c
@@ -692,11 +692,30 @@ static int max77693_set_charging(struct max77693_charger *chg, bool enable)
data);
}
+static int max77693_set_otg(struct max77693_charger *chg, bool enable)
+{
+ unsigned int data;
+
+ if (enable)
+ data = CHG_CNFG_00_OTG_MASK | CHG_CNFG_00_BOOST_MASK |
+ CHG_CNFG_00_DIS_MUIC_CTRL_MASK;
+ else
+ data = ~(CHG_CNFG_00_OTG_MASK | CHG_CNFG_00_BOOST_MASK |
+ CHG_CNFG_00_DIS_MUIC_CTRL_MASK);
+
+ return regmap_update_bits(chg->max77693->regmap,
+ MAX77693_CHG_REG_CHG_CNFG_00,
+ CHG_CNFG_00_OTG_MASK | CHG_CNFG_00_BOOST_MASK |
+ CHG_CNFG_00_DIS_MUIC_CTRL_MASK,
+ data);
+}
+
static void max77693_charger_extcon_work(struct work_struct *work)
{
struct max77693_charger *chg = container_of(work, struct max77693_charger,
cable.work);
struct extcon_dev *edev = chg->cable.edev;
+ bool set_charging, set_otg;
int connector, state;
int ret;
@@ -715,25 +734,39 @@ static void max77693_charger_extcon_work(struct work_struct *work)
case EXTCON_CHG_USB_FAST:
case EXTCON_CHG_USB_SLOW:
case EXTCON_CHG_USB_PD:
- ret = max77693_set_charging(chg, true);
- if (ret) {
- dev_err(chg->dev, "failed to enable charging\n");
- break;
- }
+ set_charging = true;
+ set_otg = false;
+
dev_info(chg->dev, "charging. connector type: %d\n",
connector);
break;
+ case EXTCON_USB_HOST:
+ set_charging = false;
+ set_otg = true;
+
+ dev_info(chg->dev, "USB host. connector type: %d\n",
+ connector);
+ break;
default:
- ret = max77693_set_charging(chg, false);
- if (ret) {
- dev_err(chg->dev, "failed to disable charging\n");
- break;
- }
+ set_charging = false;
+ set_otg = false;
+
dev_info(chg->dev, "not charging. connector type: %d\n",
connector);
break;
}
+ ret = max77693_set_charging(chg, set_charging);
+ if (ret) {
+ dev_err(chg->dev, "failed to set charging (%d)\n", ret);
+ goto out;
+ }
+
+ ret = max77693_set_otg(chg, set_otg);
+ if (ret)
+ dev_err(chg->dev, "failed to set OTG (%d)\n", ret);
+
+out:
power_supply_changed(chg->charger);
}
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 0819cf0a4f5f..1fd93bfbf3dc 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -209,7 +209,10 @@ enum max77693_charger_battery_state {
/* MAX77693 CHG_CNFG_00 register */
#define CHG_CNFG_00_CHG_MASK 0x1
+#define CHG_CNFG_00_OTG_MASK 0x2
#define CHG_CNFG_00_BUCK_MASK 0x4
+#define CHG_CNFG_00_BOOST_MASK 0x8
+#define CHG_CNFG_00_DIS_MUIC_CTRL_MASK 0x20
/* MAX77693_CHG_REG_CHG_CNFG_01 register */
#define CHG_CNFG_01_FCHGTIME_SHIFT 0
@@ -222,6 +225,8 @@ enum max77693_charger_battery_state {
/* MAX77693_CHG_REG_CHG_CNFG_02 register */
#define CHG_CNFG_02_CC_SHIFT 0
#define CHG_CNFG_02_CC_MASK 0x3F
+#define CHG_CNFG_02_OTG_ILIM_SHIFT 7
+#define CHG_CNFG_02_OTG_ILIM_MASK 0x80
/* MAX77693_CHG_REG_CHG_CNFG_03 register */
#define CHG_CNFG_03_TOITH_SHIFT 0
--
2.46.0
