summaryrefslogtreecommitdiff
path: root/board/cr50/rdd.c
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2016-07-11 15:25:02 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-07-11 21:28:06 -0700
commit2df0218c18d2756c06c67dd834b1f682baf8ccb6 (patch)
treee14b2707e728acd3df84ba7549a5478b68575f89 /board/cr50/rdd.c
parent36eb325519a46bddaa1a7567c6224fd0e28fd1c4 (diff)
downloadchrome-ec-2df0218c18d2756c06c67dd834b1f682baf8ccb6.tar.gz
cr50: Dont switch from PHY 1 to 0 when disabling CCD
The AP no longer uses PHY0 to to interact with Cr50. Cr50 only uses PHY1 so dont switch the PHY when disabling CCD just release the usb. BUG=none BRANCH=none TEST=After running 'ccd disable' the command 'usb' still returns PHY B, but 'lsusb | grep 5014' on the host doesn't show any devices. When CCD is enabled 'lsusb | grep 5014' shows a device on the host. Change-Id: Icec0acc7a0d00f7eb56c6feef3ff4cf5a3f99735 Reviewed-on: https://chromium-review.googlesource.com/359931 Commit-Ready: Mary Ruthven <mruthven@chromium.org> Tested-by: Mary Ruthven <mruthven@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'board/cr50/rdd.c')
-rw-r--r--board/cr50/rdd.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/board/cr50/rdd.c b/board/cr50/rdd.c
index f11b7a4951..beefc761dd 100644
--- a/board/cr50/rdd.c
+++ b/board/cr50/rdd.c
@@ -81,9 +81,6 @@ void rdd_attached(void)
/* Indicate case-closed debug mode (active low) */
gpio_set_level(GPIO_CCD_MODE_L, 0);
- /* Select the CCD PHY */
- usb_select_phy(USB_SEL_PHY1);
-
ccd_set_mode(CCD_MODE_ENABLED);
}
@@ -96,9 +93,6 @@ void rdd_detached(void)
/* Done with case-closed debug mode */
gpio_set_level(GPIO_CCD_MODE_L, 1);
- /* Select the AP PHY */
- usb_select_phy(USB_SEL_PHY0);
-
ccd_set_mode(CCD_MODE_DISABLED);
}
@@ -124,8 +118,8 @@ static int command_ccd(int argc, char **argv)
return EC_ERROR_PARAM1;
}
- ccprintf("CCD: %s\n", usb_get_phy() == USB_SEL_PHY1 ? " enabled" :
- "disabled");
+ ccprintf("CCD: %s\n", !gpio_get_level(GPIO_CCD_MODE_L) ?
+ " enabled" : "disabled");
ccprintf("AP UART: %s\nEC UART: %s\n",
uartn_enabled(UART_AP) ? " enabled" : "disabled",
uartn_enabled(UART_EC) ? " enabled" : "disabled");