hatch/kohaku: Remove Type A USB support for Kohaku.

Move USB Type A support from Hatch baseboard to Hatch board because not
all Hatch variants support Type A.

BUG=b:130577280
BRANCH=none
TEST=Kled device still recognizes Type-A USB flash drive.

Change-Id: I23b21b069727d57b8fea29de5bbf4e255cf3a3a9
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1573019
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>

5 files changed, 12 insertions, 15 deletions

diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c
index 6253c43469..2bfefda683 100644
--- a/baseboard/hatch/baseboard.c
+++ b/baseboard/hatch/baseboard.c
@@ -170,13 +170,7 @@ const struct pi3usb2901_config_t pi3usb2901_bc12_chips[] = {
 	},
 };
 
-/* GPIO to enable/disable the USB Type-A port. */
-const int usb_port_enable[CONFIG_USB_PORT_POWER_SMART_PORT_COUNT] = {
-	GPIO_EN_USB_A_5V,
-};
-
 /* Power Delivery and charging functions */
-
 void baseboard_tcpc_init(void)
 {
 	/* Enable PPC interrupts. */
diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h
index 81b91dcb6c..dc05188075 100644
--- a/baseboard/hatch/baseboard.h
+++ b/baseboard/hatch/baseboard.h
@@ -124,13 +124,6 @@
 /* Common Sensor Defines */
 #define CONFIG_TABLET_MODE
 
-/* USB Type A Features */
-#define CONFIG_USB_PORT_POWER_SMART
-#undef CONFIG_USB_PORT_POWER_SMART_PORT_COUNT
-#define CONFIG_USB_PORT_POWER_SMART_PORT_COUNT 1
-#define CONFIG_USB_PORT_POWER_SMART_CDP_SDP_ONLY
-#define GPIO_USB1_ILIM_SEL GPIO_EN_USB_A_LOW_PWR_OD
-
 /* TODO(b/122273953): Use correct PD delay values */
 #define PD_POWER_SUPPLY_TURN_ON_DELAY	30000	/* us */
 #define PD_POWER_SUPPLY_TURN_OFF_DELAY	250000	/* us */
diff --git a/board/hatch/board.c b/board/hatch/board.c
index 4b1f8fa883..cf3459d220 100644
--- a/board/hatch/board.c
+++ b/board/hatch/board.c
@@ -45,6 +45,11 @@
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
 
+/* GPIO to enable/disable the USB Type-A port. */
+const int usb_port_enable[CONFIG_USB_PORT_POWER_SMART_PORT_COUNT] = {
+	GPIO_EN_USB_A_5V,
+};
+
 static void ppc_interrupt(enum gpio_signal signal)
 {
 	switch (signal) {
diff --git a/board/hatch/board.h b/board/hatch/board.h
index 3370b46cd4..ae8ceec43a 100644
--- a/board/hatch/board.h
+++ b/board/hatch/board.h
@@ -57,6 +57,13 @@
 #define BOARD_TCPC_C1_RESET_HOLD_DELAY PS8XXX_RESET_DELAY_MS
 #define BOARD_TCPC_C1_RESET_POST_DELAY 0
 
+/* USB Type A Features */
+#define CONFIG_USB_PORT_POWER_SMART
+#undef CONFIG_USB_PORT_POWER_SMART_PORT_COUNT
+#define CONFIG_USB_PORT_POWER_SMART_PORT_COUNT 1
+#define CONFIG_USB_PORT_POWER_SMART_CDP_SDP_ONLY
+#define GPIO_USB1_ILIM_SEL GPIO_EN_USB_A_LOW_PWR_OD
+
 /* Volume Button feature */
 #define CONFIG_VOLUME_BUTTONS
 #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL
diff --git a/board/kohaku/gpio.inc b/board/kohaku/gpio.inc
index 28a7d400f7..47028dd2a6 100644
--- a/board/kohaku/gpio.inc
+++ b/board/kohaku/gpio.inc
@@ -62,8 +62,6 @@ GPIO(EC_INT_L,                 PIN(7, 0), GPIO_OUT_HIGH)
 GPIO(USB_C_OC_ODL,             PIN(B, 1), GPIO_ODR_HIGH)
 GPIO(USB_C0_TCPC_RST,          PIN(9, 7), GPIO_OUT_LOW)
 GPIO(USB_C1_TCPC_RST_ODL,      PIN(3, 2), GPIO_ODR_HIGH)
-GPIO(EN_USB_A_5V,              PIN(3, 5), GPIO_OUT_LOW)
-GPIO(EN_USB_A_LOW_PWR_OD,      PIN(9, 4), GPIO_OUT_LOW)
 
 /* Misc Signals */
 GPIO(EC_BATT_PRES_ODL,         PIN(E, 1), GPIO_INPUT)