diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2016-12-21 15:36:51 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2017-01-04 22:02:52 +0100 |
| commit | 7508f44129ca3dc749d057fa8c6f7164d85153db (patch) | |
| tree | 47aa45ac782f5dc198f74860a67f241c91925f9d /drivers/power | |
| parent | power: supply: axp288_charger: Move init_hw_regs call before supply registration (diff) | |
| download | linux-7508f44129ca3dc749d057fa8c6f7164d85153db.tar.xz linux-7508f44129ca3dc749d057fa8c6f7164d85153db.zip | |
power: supply: axp288_charger: Actually get and use the USB_HOST extcon device
Nothing was setting info->otg.cable, so the extcon_get_cable_state_
calls on it would always return -EINVAL.
This commit fixes this by actually setting info->otg.cable using the new
extcon_get_extcon_dev_by_cable_id function.
This commit also makes failing to register the extcon notifier for the
USB_HOST cable an error rather then a warning, because we MUST have this
notfier to properly disable the VBUS path when in host mode so that we're
not drawing current from the 5V boost converter which is supplying power
to the otg port when in host mode.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/axp288_charger.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/power/supply/axp288_charger.c b/drivers/power/supply/axp288_charger.c index 1588efd88a1c..4443f11525b8 100644 --- a/drivers/power/supply/axp288_charger.c +++ b/drivers/power/supply/axp288_charger.c @@ -127,6 +127,7 @@ #define ILIM_3000MA 3000 /* 3000mA */ #define AXP288_EXTCON_DEV_NAME "axp288_extcon" +#define USB_HOST_EXTCON_DEV_NAME "INT3496:00" enum { VBUS_OV_IRQ = 0, @@ -833,6 +834,12 @@ static int axp288_charger_probe(struct platform_device *pdev) return -EPROBE_DEFER; } + info->otg.cable = extcon_get_extcon_dev(USB_HOST_EXTCON_DEV_NAME); + if (info->otg.cable == NULL) { + dev_dbg(dev, "EXTCON_USB_HOST is not ready, probe deferred\n"); + return -EPROBE_DEFER; + } + platform_set_drvdata(pdev, info); mutex_init(&info->lock); @@ -868,12 +875,12 @@ static int axp288_charger_probe(struct platform_device *pdev) info->otg.id_nb.notifier_call = axp288_charger_handle_otg_evt; ret = devm_extcon_register_notifier(&pdev->dev, info->otg.cable, EXTCON_USB_HOST, &info->otg.id_nb); - if (ret) - dev_warn(&pdev->dev, "failed to register otg notifier\n"); - - if (info->otg.cable) - info->otg.id_short = extcon_get_state( - info->otg.cable, EXTCON_USB_HOST); + if (ret) { + dev_err(dev, "failed to register EXTCON_USB_HOST notifier\n"); + return ret; + } + info->otg.id_short = extcon_get_cable_state_(info->otg.cable, + EXTCON_USB_HOST); /* Register charger interrupts */ for (i = 0; i < CHRG_INTR_END; i++) { |