From 8d6ea6a491fb53460762a2f01c7e637a5c7cccc1 Mon Sep 17 00:00:00 2001 From: You-Cheng Syu Date: Wed, 13 Mar 2019 21:37:23 +0800 Subject: ec/google/chromeec: Update ec_commands.h Copy ec_commands.h directly from ChromiumOS EC repository (CL:1520574). Since ec_commands.h already defines usb_charge_mode and only USB_CHARGE_MODE_DISABLED is used in coreboot, enum usb_charge_mode is removed from ec.h. To avoid redefinition of the BIT macro, #ifndef check is added to include/types.h. BUG=b:109900671,b:118654976 BRANCH=none TEST=emerge-kukui -j coreboot Change-Id: I7ed5344fc8923e45e17c3e2a34371db6f80b079d Signed-off-by: You-Cheng Syu Reviewed-on: https://review.coreboot.org/c/coreboot/+/31885 Reviewed-by: Hung-Te Lin Tested-by: build bot (Jenkins) --- src/ec/google/chromeec/ec.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/ec/google/chromeec/ec.h') diff --git a/src/ec/google/chromeec/ec.h b/src/ec/google/chromeec/ec.h index 7a383364a2..d7fe7337c3 100644 --- a/src/ec/google/chromeec/ec.h +++ b/src/ec/google/chromeec/ec.h @@ -94,13 +94,6 @@ int google_chromeec_cbi_get_oem_name(char *buf, size_t bufsize); #define MEC_EMI_RANGE_START EC_HOST_CMD_REGION0 #define MEC_EMI_RANGE_END (EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SIZE) -enum usb_charge_mode { - USB_CHARGE_MODE_DISABLED, - USB_CHARGE_MODE_CHARGE_AUTO, - USB_CHARGE_MODE_CHARGE_BC12, - USB_CHARGE_MODE_DOWNSTREAM_500MA, - USB_CHARGE_MODE_DOWNSTREAM_1500MA, -}; int google_chromeec_set_usb_charge_mode(u8 port_id, enum usb_charge_mode mode); int google_chromeec_set_usb_pd_role(u8 port, enum usb_pd_control_role role); /* -- cgit v1.2.3