diff options
author | Jonathan Bakker <xc-racer2@live.ca> | 2020-05-15 02:04:33 +0300 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2020-08-28 20:27:45 +0300 |
commit | c1f73028f75df43689feda4bc70573b7d18a618e (patch) | |
tree | 9d5305cd6459a1036cfb18d375b5ac1274f57612 /include/linux/power | |
parent | 9434e4530d4690d3c5c869b4528364d7636108b3 (diff) | |
download | linux-c1f73028f75df43689feda4bc70573b7d18a618e.tar.xz |
power: supply: charger-manager: Update extcon functions
In commit 830ae442202e ("extcon: Remove the deprecated extcon functions")
the function extcon_register_interest became a no-op returning an error,
leading to non-functional behaviour in charger-manager.
Additionally, a translation table is needed between the text representation
of the extcon cable names and their IDs is needed. In order to retain DT
compatibility, TA and CHARGE-DOWNSTREAM are added as they were present up
until commit 11eecf910bd8 ("extcon: Modify the id and name of external
connector")
Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'include/linux/power')
-rw-r--r-- | include/linux/power/charger-manager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h index c127dbe31e49..45e228b353ea 100644 --- a/include/linux/power/charger-manager.h +++ b/include/linux/power/charger-manager.h @@ -40,7 +40,7 @@ enum cm_batt_temp { /** * struct charger_cable * @extcon_name: the name of extcon device. - * @name: the name of charger cable(external connector). + * @name: the name of the cable connector * @extcon_dev: the extcon device. * @wq: the workqueue to control charger according to the state of * charger cable. If charger cable is attached, enable charger. @@ -56,9 +56,10 @@ enum cm_batt_temp { struct charger_cable { const char *extcon_name; const char *name; + struct extcon_dev *extcon_dev; + u64 extcon_type; /* The charger-manager use Extcon framework */ - struct extcon_specific_cable_nb extcon_dev; struct work_struct wq; struct notifier_block nb; |