mfd: cros_ec: Separate charge-control probing from USB-PD
PATCH 1/1 mfd: cros_ec: Separate charge-control probing from USB-PD
From: Thomas Weißschuh <[email protected]>
[ Upstream commit e40fc1160d491c3bcaf8e940ae0dde0a7c5e8e14 ]
The charge-control subsystem in the ChromeOS EC is not strictly tied to its USB-PD subsystem.
Since commit 7613bc0d116a ("mfd: cros_ec: Don't load charger with UCSI") the presence of EC_FEATURE_UCSI_PPM would inhibit the probing of the charge-control driver.
Furthermore recent versions of the EC firmware in Framework laptops hard-disable EC_FEATURE_USB_PD to avoid probing cros-usbpd-charger, which then also breaks cros-charge-control.
Instead use the dedicated EC_FEATURE_CHARGER.
Fixes 555b5fcdb844 ("mfd: cros_ec: Register charge control subdevice")
Signed-off-by Thomas Weißschuh <[email protected]>
Reviewed-by Tzung-Bi Shih <[email protected]>
Tested-by Tom Vincent <[email protected]>
Link https://lore.kernel.org/r/20250521-cros-ec-mfd-chctl-probe-v1-1-6ebfe3a6efa7@weissschuh.net open here
Signed-off-by Lee Jones <[email protected]>
--- drivers/mfd/cros_ec_dev.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/mfd/cros_ec_dev.c +9 -1
@@ -87,7 +87,6 @@ static const struct mfd_cell cros_ec_sensorhub_cells[] = { };static const struct mfd_cell cros_usbpd_charger_cells[] = { - { .name ="cros-charge-control" , }, { .name ="cros-usbpd-charger" , }, { .name ="cros-usbpd-logger" , }, };
@@ -108,6 +107,10 @@ static const struct mfd_cell cros_ec_keyboard_leds_cells[] = { { .name = "cros-keyboard-leds", }, }; +static const struct mfd_cell cros_ec_charge_control_cells[] = { + { .name ="cros-charge-control" , }, +}; +static const struct cros_feature_to_cells cros_subdevices[] = { { .id =EC_FEATURE_CEC ,
@@ -144,6 +147,11 @@ static const struct cros_feature_to_cells cros_subdevices[] = { .mfd_cells = cros_ec_keyboard_leds_cells, .num_cells = ARRAY_SIZE(cros_ec_keyboard_leds_cells), }, + { + .id = EC_FEATURE_CHARGER, + .mfd_cells = cros_ec_charge_control_cells, + .num_cells = ARRAY_SIZE(cros_ec_charge_control_cells), + }, };static const struct mfd_cell cros_ec_platform_cells[] = {
Signature · 1 line
2.50.1