Skip to content

Commit 420ad12

Browse files
JohnAZoidbergquinchou77
authored andcommitted
fwk: Require CONFIG_USB_POWER_DELIVERY for EC_FEATURE_USB_PD
The linux kernel driver cros-usbpd-charger uses host commands and events commands from both configurations. Currently it fails on all our platforms with the dmesg log: [ 24.706760] cros-usbpd-charger cros-usbpd-charger.7.auto: No USB PD charging ports found See Linux kernel sources: - drivers/power/supply/cros_usbpd-charger.c - EC_CMD_CHARGE_PORT_COUNT - EC_CMD_USB_PD_PORTS - EC_CMD_USB_PD_DISCOVERY - EC_CMD_USB_PD_POWER_INFO - EC_CMD_EXTERNAL_POWER_LIMIT - drivers/platform/chrome/cros_usbpd_notify.c - EC_CMD_PD_HOST_EVENT_STATUS - drivers/mfd/cros_ec_dev.c - EC_FEATURE_USB_PD EC_FEATURE_USB_PD is bit 22. ``` ec:~> feat 0-31: 0x0247e6ae 32-63: 0x00000207 ec:~> feat 0-31: 0x0207e6ae 32-63: 0x00000207 ``` BUG=FrameworkComputer/SoftwareFirmwareIssueTracker#2 BRANCH=fwk-main TEST=Check feat command on EC console to check bit 22 is 0. And check dmesg on Linux for cros-usbpd-charger error message Signed-off-by: Daniel Schaefer <[email protected]> (cherry picked from commit e444bed03ed90106577207fd1837a8a07aa6ba67)
1 parent 8fe0304 commit 420ad12

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

common/ec_features.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ uint32_t get_feature_flags0(void)
8282
#ifdef CONFIG_HOSTCMD_PD
8383
| EC_FEATURE_MASK_0(EC_FEATURE_SUB_MCU)
8484
#endif
85-
#ifdef CONFIG_CHARGE_MANAGER
85+
#if defined(CONFIG_CHARGE_MANAGER) && defined(CONFIG_USB_POWER_DELIVERY)
8686
| EC_FEATURE_MASK_0(EC_FEATURE_USB_PD)
8787
#endif
8888
#ifdef CONFIG_ACCEL_FIFO

0 commit comments

Comments
 (0)