diff options
| author | YH Lin <yueherngl@google.com> | 2022-11-30 21:45:30 +0000 |
|---|---|---|
| committer | YH Lin <yueherngl@google.com> | 2022-11-30 21:45:30 +0000 |
| commit | 184d13e77614be3be5374d3fef9d1edf66ec8687 (patch) | |
| tree | d0c89ae8814c2ba35c238c6c0644ec6b1602c63a /common/acpi.c | |
| parent | 19d4d68ffa8b6910d716ab5e1953c41b58614a57 (diff) | |
| parent | aa40b859b3a73e5a205bc561c1a29eff38485461 (diff) | |
| download | chrome-ec-184d13e77614be3be5374d3fef9d1edf66ec8687.tar.gz | |
Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main
Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main
Relevant changes:
git log --oneline 19d4d68ffa..aa40b859b3 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/kano board/mithrax board/osiris board/primus
board/redrix board/taeko board/taniks board/vell board/volmar
driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
include/intel_x86.h power/alderlake* power/intel_x86.c
util/getversion.sh
e6da633c38 driver: Sort header files
234a87ae2d tcpci: Add FRS enable to driver structure
a56be59ccd tcpm_header: add test for tcpm_dump_registers
57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
e420c8ff9a marasov: Modify TypeC and TypeA configuration.
43b53e0045 Add default implementation of board_set_charge_limit
b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
f1b563c350 baseboard: Sort header files
7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
8f89f69a5b crota: disable lid angle sensor for clamshell
BRANCH=None
BUG=b:260630630 b:163093572 b:259002141 b:255184961 b:259354679
BUG=b:247100970 b:254328661
TEST=`emerge-brya chromeos-ec`
Force-Relevant-Builds: all
Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62
Signed-off-by: YH Lin <yueherngl@google.com>
Diffstat (limited to 'common/acpi.c')
| -rw-r--r-- | common/acpi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common/acpi.c b/common/acpi.c index c6fcfce417..5dd71d244e 100644 --- a/common/acpi.c +++ b/common/acpi.c @@ -5,6 +5,7 @@ #include "acpi.h" #include "battery.h" +#include "body_detection.h" #include "common.h" #include "console.h" #include "dptf.h" @@ -17,8 +18,8 @@ #include "lpc.h" #include "printf.h" #include "pwm.h" -#include "timer.h" #include "tablet_mode.h" +#include "timer.h" #include "usb_charge.h" #include "usb_common.h" #include "util.h" @@ -235,6 +236,11 @@ int acpi_ap_to_ec(int is_cmd, uint8_t value, uint8_t *resultptr) EC_ACPI_MEM_DDPN_MASK) << EC_ACPI_MEM_DDPN_SHIFT; #endif + +#ifdef CONFIG_BODY_DETECTION_NOTIFY_MODE_CHANGE + if (body_detect_get_state() == BODY_DETECTION_ON_BODY) + result |= BIT(EC_ACPI_MEM_STTB_SHIFT); +#endif break; case EC_ACPI_MEM_DEVICE_FEATURES0: |