diff options
| author | Jett Rink <jettrink@chromium.org> | 2018-03-21 10:53:41 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-03-23 14:50:51 -0700 |
| commit | ca204befd3c9365950cbb9336f0b71bd42c1047a (patch) | |
| tree | 76f459116a320c1239eb1b72fd2025962d2ae8af /driver | |
| parent | d1bb1da8e79895197f77e86cd907d9d4dbd5d0f0 (diff) | |
| download | chrome-ec-ca204befd3c9365950cbb9336f0b71bd42c1047a.tar.gz | |
tcpc: rename CONFIG_USB_PD_TCPM_ANX74XX to CONFIG_USB_PD_TCPM_ANX3429
Since all of the uses of CONFIG_USB_PD_TCPM_ANX74XX are actually for
ANX3429, rename the option especially since the ANX7447
driver will not reuse the ANX74XX driver which is being introduced
in CL:956790.
Also adding the CONFIG_USB_PD_TCPM_ANX740X and
CONFIG_USB_PD_TCPM_ANX741X options to advertise which versions of the
ANX chip the anx74xx.c driver applies to.
BRANCH=none
BUG=chromium:824208
TEST=build all
Change-Id: Ib47f4661466e54ff2a0c52d517eb318d3bfd25a2
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/973558
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/build.mk | 4 | ||||
| -rw-r--r-- | driver/tcpm/tcpci.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/driver/build.mk b/driver/build.mk index 924a76eecd..cc0a119640 100644 --- a/driver/build.mk +++ b/driver/build.mk @@ -99,7 +99,9 @@ driver-$(CONFIG_USB_PD_TCPM_STUB)+=tcpm/stub.o driver-$(CONFIG_USB_PD_TCPM_TCPCI)+=tcpm/tcpci.o driver-$(CONFIG_USB_PD_TCPM_FUSB302)+=tcpm/fusb302.o driver-$(CONFIG_USB_PD_TCPM_ITE83XX)+=tcpm/it83xx.o -driver-$(CONFIG_USB_PD_TCPM_ANX74XX)+=tcpm/anx74xx.o +driver-$(CONFIG_USB_PD_TCPM_ANX3429)+=tcpm/anx74xx.o +driver-$(CONFIG_USB_PD_TCPM_ANX740X)+=tcpm/anx74xx.o +driver-$(CONFIG_USB_PD_TCPM_ANX741X)+=tcpm/anx74xx.o driver-$(CONFIG_USB_PD_TCPM_ANX7688)+=tcpm/anx7688.o driver-$(CONFIG_USB_PD_TCPM_PS8751)+=tcpm/ps8xxx.o driver-$(CONFIG_USB_PD_TCPM_PS8805)+=tcpm/ps8xxx.o diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index 11c7283124..e1c1efab28 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -380,7 +380,9 @@ int tcpci_get_chip_info(int port, int renew, i->device_id = val; switch (i->vendor_id) { -#ifdef CONFIG_USB_PD_TCPM_ANX74XX +#if defined(CONFIG_USB_PD_TCPM_ANX3429) || \ + defined(CONFIG_USB_PD_TCPM_ANX740X) || \ + defined(CONFIG_USB_PD_TCPM_ANX741X) case ANX74XX_VENDOR_ID: error = anx74xx_tcpc_get_fw_version(port, &val); break; |