summaryrefslogtreecommitdiff
path: root/board/fruitpie
diff options
context:
space:
mode:
authorAlec Berg <alecaberg@chromium.org>2014-10-10 01:45:22 +0000
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-10 06:54:16 +0000
commit358aeb287778d40ae6d57157ec2b9117a69070fe (patch)
treed074cd6cb2321a6d3b8c22351e47c68491a90e66 /board/fruitpie
parentf92f70d04cc90bb313b1a7ceadb7bcc0bfc82bb4 (diff)
downloadchrome-ec-358aeb287778d40ae6d57157ec2b9117a69070fe.tar.gz
Revert "pd: samus: ryu: add Vconn support and enable for samus and ryu"
This reverts commit 61dc089e23091a337a49f062d9058741a0ebf3bd. Samus polarity is wrong on VCONN due to naming mismatch. Will fix in a later CL, but should revert now to avoid problems. Change-Id: Icabcf2967e92caec94840df7e66a6658c7cde007 Reviewed-on: https://chromium-review.googlesource.com/222717 Reviewed-by: Alec Berg <alecaberg@chromium.org> Commit-Queue: Alec Berg <alecaberg@chromium.org> Tested-by: Alec Berg <alecaberg@chromium.org> Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board/fruitpie')
-rw-r--r--board/fruitpie/board.h1
-rw-r--r--board/fruitpie/usb_pd_config.h7
2 files changed, 0 insertions, 8 deletions
diff --git a/board/fruitpie/board.h b/board/fruitpie/board.h
index 25806e3142..d20606ebbb 100644
--- a/board/fruitpie/board.h
+++ b/board/fruitpie/board.h
@@ -27,7 +27,6 @@
#define CONFIG_USB_PD_DUAL_ROLE
#define CONFIG_USB_PD_INTERNAL_COMP
#define CONFIG_USBC_SS_MUX
-#define CONFIG_USBC_VCONN
#define CONFIG_ADC
#define CONFIG_HW_CRC
#define CONFIG_I2C
diff --git a/board/fruitpie/usb_pd_config.h b/board/fruitpie/usb_pd_config.h
index 4f7639c2f5..d53da1c7b6 100644
--- a/board/fruitpie/usb_pd_config.h
+++ b/board/fruitpie/usb_pd_config.h
@@ -138,13 +138,6 @@ static inline int pd_adc_read(int port, int cc)
return adc_read_channel(ADC_CH_CC2_PD);
}
-static inline void pd_set_vconn(int port, int polarity, int enable)
-{
- /* Set VCONN on the opposite CC line from the polarity */
- gpio_set_level(polarity ? GPIO_VCONN1_EN :
- GPIO_VCONN2_EN, enable);
-}
-
static inline int pd_snk_is_vbus_provided(int port)
{
return gpio_get_level(GPIO_VBUS_WAKE);