diff options
| author | Alec Berg <alecaberg@chromium.org> | 2014-11-20 16:20:51 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-22 00:13:06 +0000 |
| commit | 446002d2f86db9329923da80a1425d4d66a6289c (patch) | |
| tree | f229f377827e6d2ebc46167ff1601e70dd0025a5 | |
| parent | 881e9cce86cb2af87153118baefc6c776193529d (diff) | |
| download | chrome-ec-446002d2f86db9329923da80a1425d4d66a6289c.tar.gz | |
zinger: change product type to undefined
Change zinger/minimuffin product type from AMA to
undefined.
BUG=none
BRANCH=samus
TEST=make buildall. load onto zinger, plug in samus, see:
SVDM/4 [1] ff008041 040018d1 00000000 50120001
[19.163111 DONE]
Verify ID header, 2nd word, bits 27-29 are product type,
where 0 is undefined.
Also verify that product VDO is present, 4th word.
Change-Id: I34a70d9356b5a8ee7ad64a4e8f072d7748aa916e
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/231172
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Todd Broch <tbroch@chromium.org>
| -rw-r--r-- | board/zinger/board.h | 2 | ||||
| -rw-r--r-- | board/zinger/usb_pd_policy.c | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/board/zinger/board.h b/board/zinger/board.h index 89a44f370f..8d7dcd4268 100644 --- a/board/zinger/board.h +++ b/board/zinger/board.h @@ -53,8 +53,6 @@ #undef CONFIG_USB_PD_INTERNAL_COMP #undef CONFIG_USB_PD_RX_COMP_IRQ #define CONFIG_USB_PD_SIMPLE_DFP -#define CONFIG_USB_PD_IDENTITY_HW_VERS CONFIG_USB_PD_HW_DEV_ID_BOARD_MINOR -#define CONFIG_USB_PD_IDENTITY_SW_VERS 0 #undef CONFIG_WATCHDOG_HELP #undef CONFIG_WATCHDOG_PERIOD_MS #define CONFIG_WATCHDOG_PERIOD_MS 2300 diff --git a/board/zinger/usb_pd_policy.c b/board/zinger/usb_pd_policy.c index de8104fea5..e4cb5ea9f4 100644 --- a/board/zinger/usb_pd_policy.c +++ b/board/zinger/usb_pd_policy.c @@ -416,20 +416,12 @@ DECLARE_IRQ(STM32_IRQ_ADC_COMP, pd_adc_interrupt, 1); /* ----------------- Vendor Defined Messages ------------------ */ const uint32_t vdo_idh = VDO_IDH(0, /* data caps as USB host */ 0, /* data caps as USB device */ - IDH_PTYPE_AMA, /* Alternate mode */ + IDH_PTYPE_UNDEF, /* Undefined */ 1, /* supports alt modes */ USB_VID_GOOGLE); const uint32_t vdo_product = VDO_PRODUCT(CONFIG_USB_PID, CONFIG_USB_BCD_DEV); -const uint32_t vdo_ama = VDO_AMA(CONFIG_USB_PD_IDENTITY_HW_VERS, - CONFIG_USB_PD_IDENTITY_SW_VERS, - 0, 0, 0, 0, /* SS[TR][12] */ - 0, /* Vconn power */ - 0, /* Vconn power required */ - 0, /* Vbus power required */ - AMA_USBSS_BBONLY /* USB SS support */); - /* When set true, we are in GFU mode */ static int gfu_mode; @@ -438,8 +430,7 @@ static int svdm_response_identity(int port, uint32_t *payload) payload[VDO_I(IDH)] = vdo_idh; payload[VDO_I(CSTAT)] = VDO_CSTAT(0); payload[VDO_I(PRODUCT)] = vdo_product; - payload[VDO_I(AMA)] = vdo_ama; - return VDO_I(AMA) + 1; + return VDO_I(PRODUCT) + 1; } static int svdm_response_svids(int port, uint32_t *payload) |