diff options
| author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:19:30 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:05 +0000 |
| commit | c8af732351cc5c7167f27e8390e26f0556f53a5a (patch) | |
| tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /driver/retimer/anx7483.c | |
| parent | af25602b15b22b9ef5821dcba9934311f2157c48 (diff) | |
| download | chrome-ec-factory-brya-14517.B-main.tar.gz | |
Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main"factory-brya-14517.B-main
This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.
Reason for revert: broken build due to ec-utils.
Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14517.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
>
> Relevant changes:
>
> git log --oneline 54462f034b..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:259002141 b:255184961 b:247100970 b:259354679 b:260630630
> BUG=b:163093572 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
> Signed-off-by: YH Lin <yueherngl@google.com>
Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
Bug: b:163093572 b:254328661
Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248
Tested-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Auto-Submit: YH Lin <yueherngl@chromium.org>
Diffstat (limited to 'driver/retimer/anx7483.c')
| -rw-r--r-- | driver/retimer/anx7483.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/driver/retimer/anx7483.c b/driver/retimer/anx7483.c index f8b11f0e85..3f4713fc85 100644 --- a/driver/retimer/anx7483.c +++ b/driver/retimer/anx7483.c @@ -6,11 +6,11 @@ */ #include "anx7483.h" +#include "retimer/anx7483_public.h" #include "chipset.h" #include "common.h" #include "console.h" #include "i2c.h" -#include "retimer/anx7483_public.h" #include "timer.h" #include "usb_mux.h" #include "util.h" @@ -346,34 +346,6 @@ enum ec_error_list anx7483_set_eq(const struct usb_mux *me, return anx7483_write(me, reg, value); } -enum ec_error_list anx7483_set_fg(const struct usb_mux *me, - enum anx7483_tune_pin pin, - enum anx7483_fg_setting fg) -{ - int reg, value; - - if (pin == ANX7483_PIN_UTX1) - reg = ANX7483_UTX1_PORT_CFG2_REG; - else if (pin == ANX7483_PIN_UTX2) - reg = ANX7483_UTX2_PORT_CFG2_REG; - else if (pin == ANX7483_PIN_URX1) - reg = ANX7483_URX1_PORT_CFG2_REG; - else if (pin == ANX7483_PIN_URX2) - reg = ANX7483_URX2_PORT_CFG2_REG; - else if (pin == ANX7483_PIN_DRX1) - reg = ANX7483_DRX1_PORT_CFG2_REG; - else if (pin == ANX7483_PIN_DRX2) - reg = ANX7483_DRX2_PORT_CFG2_REG; - else - return EC_ERROR_INVAL; - - RETURN_ERROR(anx7483_read(me, reg, &value)); - value &= ~ANX7483_CFG2_FG_MASK; - value |= fg << ANX7483_CFG2_FG_SHIFT; - - return anx7483_write(me, reg, value); -} - const struct usb_mux_driver anx7483_usb_retimer_driver = { .init = anx7483_init, .set = anx7483_set, |