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>

8 files changed, 2 insertions, 40 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);
diff --git a/board/ryu/board.h b/board/ryu/board.h
index 47104dc837..cfae1613bd 100644
--- a/board/ryu/board.h
+++ b/board/ryu/board.h
@@ -25,7 +25,6 @@
 #define CONFIG_USB_PD_FLASH_ERASE_CHECK
 #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/ryu/usb_pd_config.h b/board/ryu/usb_pd_config.h
index bd984ee8d7..cc1aa40f3c 100644
--- a/board/ryu/usb_pd_config.h
+++ b/board/ryu/usb_pd_config.h
@@ -147,13 +147,6 @@ static inline int pd_adc_read(int port, int cc)
 		return adc_read_channel(ADC_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_USBC_VCONN1_EN :
-				  GPIO_USBC_VCONN2_EN, enable);
-}
-
 static inline int pd_snk_is_vbus_provided(int port)
 {
 	return gpio_get_level(GPIO_CHGR_ACOK);
diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h
index be10941af7..a666af34b4 100644
--- a/board/samus_pd/board.h
+++ b/board/samus_pd/board.h
@@ -34,7 +34,6 @@
 #define CONFIG_USB_PD_FLASH_ERASE_CHECK
 #define CONFIG_USB_PD_INTERNAL_COMP
 #define CONFIG_USBC_SS_MUX
-#define CONFIG_USBC_VCONN
 #define CONFIG_USB_SWITCH_TSU6721
 #define CONFIG_VBOOT_HASH
 #undef  CONFIG_WATCHDOG_HELP
diff --git a/board/samus_pd/usb_pd_config.h b/board/samus_pd/usb_pd_config.h
index 73dff26486..0d0372d51a 100644
--- a/board/samus_pd/usb_pd_config.h
+++ b/board/samus_pd/usb_pd_config.h
@@ -227,17 +227,6 @@ static inline int pd_adc_read(int port, int cc)
 		return adc_read_channel(cc ? ADC_C1_CC2_PD : ADC_C1_CC1_PD);
 }
 
-static inline void pd_set_vconn(int port, int polarity, int enable)
-{
-	/* Set VCONN on the opposite CC line from the polarity */
-	if (port == 0)
-		gpio_set_level(polarity ? GPIO_USB_C0_CC1_VCONN1_EN :
-					  GPIO_USB_C0_CC2_VCONN1_EN, enable);
-	else
-		gpio_set_level(polarity ? GPIO_USB_C1_CC1_VCONN1_EN :
-					  GPIO_USB_C1_CC2_VCONN1_EN, enable);
-}
-
 static inline int pd_snk_is_vbus_provided(int port)
 {
 	return gpio_get_level(port ? GPIO_USB_C1_VBUS_WAKE :
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index 4ed08a64d8..860ba924c4 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -283,16 +283,13 @@ static inline void set_state(int port, enum pd_states next_state)
 	set_state_timeout(port, 0, 0);
 	pd[port].task_state = next_state;
 
+#ifdef CONFIG_USBC_SS_MUX
 	if (next_state == PD_STATE_SRC_DISCONNECTED) {
 		pd[port].dev_id = 0;
-#ifdef CONFIG_USBC_SS_MUX
 		board_set_usb_mux(port, TYPEC_MUX_NONE,
 				  pd[port].polarity);
-#endif
-#ifdef CONFIG_USBC_VCONN
-		pd_set_vconn(port, pd[port].polarity, 0);
-#endif
 	}
+#endif
 
 #ifdef CONFIG_LOW_POWER_IDLE
 	/* If any PD port is connected, then disable deep sleep */
@@ -1249,10 +1246,6 @@ void pd_task(void)
 					break;
 				}
 
-#ifdef CONFIG_USBC_VCONN
-				pd_set_vconn(port, pd[port].polarity, 1);
-#endif
-
 				set_state(port, PD_STATE_SRC_DISCOVERY);
 				caps_count = 0;
 #ifdef CONFIG_USB_PD_DUAL_ROLE
diff --git a/include/config.h b/include/config.h
index ef1f14ff2d..3183e3b267 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1041,9 +1041,6 @@
 /* Support for USB type-c superspeed mux */
 #undef CONFIG_USBC_SS_MUX
 
-/* Support for USB type-c vconn. Not needed for captive cables. */
-#undef CONFIG_USBC_VCONN
-
 /*****************************************************************************/
 /* USB interfaces config */