summaryrefslogtreecommitdiff
path: root/chip
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2016-04-12 14:34:41 -0700
committerBill Richardson <wfrichar@chromium.org>2016-04-13 18:31:53 +0000
commit52f7b3a0c842810d119b63894ce5c12d88363b5c (patch)
tree905b767467cc37cc581681b002ba57da475e41e3 /chip
parent7ce63a09f9137bb6e5edd19e506ed98e9967884c (diff)
downloadchrome-ec-52f7b3a0c842810d119b63894ce5c12d88363b5c.tar.gz
cr50: default to CCD PHY
While kevin is still in development default to connecting to the CCD PHY instead of the AP PHY. This will automatically enable CCD instead of having to rely on things working to detect the debug accessory and switch to the proper PHY. We also disable the TX lines to the AP and EC, in case servo is connected. To turn them on manually, use these console commands: rw 0x40060040 74 rw 0x400600c8 78 pinmux gpiocfg BUG=chrome-os-partner:50700,chrome-os-partner:52281,http://crosbug.com/p/52322 BRANCH=none TEST=hook up suzy q to kevin. Run 'lsusb -vd 18d1:5014' and check that a device appears. Change-Id: Ic2802430680adc6186982022c995ee6f452b45fd Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/338680 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Trybot-Ready: Bill Richardson <wfrichar@chromium.org> Tested-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r--chip/g/usb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/chip/g/usb.c b/chip/g/usb.c
index 104da0caf3..eeebd18470 100644
--- a/chip/g/usb.c
+++ b/chip/g/usb.c
@@ -313,7 +313,7 @@ static enum {
static uint8_t configuration_value;
/* Default PHY to use */
-static uint32_t which_phy = USB_SEL_PHY0;
+static uint32_t which_phy = USB_SEL_PHY1;
static inline void select_phy(uint32_t phy)
{
which_phy = phy;
@@ -1238,6 +1238,7 @@ void usb_init(void)
/* Select the correct PHY */
select_phy(which_phy);
+ gpio_set_level(GPIO_CCD_MODE_L, !(which_phy == USB_SEL_PHY1));
/* Full-Speed Serial PHY */
GR_USB_GUSBCFG = GUSBCFG_PHYSEL_FS | GUSBCFG_FSINTF_6PIN