driver: Move PI3USB9281 to bc12 directory.

The primary purpose of the Pericom PI3USB9281 is for BC1.2 detection. Therefore, move the driver to the bc12/ directory. Additonally, rename the config option to match. CONFIG_USB_SWITCH_PI3USB9281 => CONFIG_BC12_DETECT_PI3USB9281 BUG=None BRANCH=None TEST=`make -j buildall` Change-Id: I02f17064c0625e62d6779f895e69899c24898f74 Signed-off-by: Aseda Aboagye <aaboagye@google.com> Reviewed-on: https://chromium-review.googlesource.com/594710 Commit-Ready: Aseda Aboagye <aaboagye@chromium.org> Tested-by: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Shawn N <shawnn@chromium.org>
2025-12-29 18:11:05 +00:00 · 2017-07-31 11:01:00 -07:00
parent e67ca79456
commit 553d00bdb4
25 changed files with 40 additions and 44 deletions
--- a/board/chell/board.c
+++ b/board/chell/board.c
@@ -167,7 +167,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 static int ps8740_tune_mux(const struct usb_mux *mux)
 {
--- a/board/chell/board.h
+++ b/board/chell/board.h
@@ -82,8 +82,8 @@
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_USB_PD_TRY_SRC
 #define CONFIG_USB_PD_VBUS_DETECT_GPIO
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 2
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2
 #define CONFIG_USBC_SS_MUX
 #define CONFIG_USBC_SS_MUX_DFP_ONLY
 #define CONFIG_USBC_VCONN
--- a/board/elm/board.c
+++ b/board/elm/board.c
@@ -134,7 +134,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 /*
 * Temperature sensors data; must be in same order as enum temp_sensor_id.
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -110,8 +110,8 @@
 #undef CONFIG_UART_RX_DMA

 /* BC 1.2 charger */
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 1
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 1

 /* Optional features */
 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON
--- a/board/glados/board.c
+++ b/board/glados/board.c
@@ -158,7 +158,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
 	{
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -82,8 +82,8 @@
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_USB_PD_TRY_SRC
 #define CONFIG_USB_PD_VBUS_DETECT_GPIO
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 2
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2
 #define CONFIG_USBC_SS_MUX
 #define CONFIG_USBC_SS_MUX_DFP_ONLY
 #define CONFIG_USBC_VCONN
--- a/board/kahlee/board.c
+++ b/board/kahlee/board.c
@@ -177,7 +177,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = {
 	[0] = {
--- a/board/kahlee/board.h
+++ b/board/kahlee/board.h
@@ -129,8 +129,8 @@
 #define CONFIG_WIRELESS_SUSPEND EC_WIRELESS_SWITCH_WLAN_POWER
 #define CONFIG_WLAN_POWER_ACTIVE_LOW
 #define WIRELESS_GPIO_WLAN_POWER GPIO_WIRELESS_GPIO_WLAN_POWER
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 2
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2

 /*
 * During shutdown sequence TPS65094x PMIC turns off the sensor rails
--- a/board/oak/board.c
+++ b/board/oak/board.c
@@ -133,7 +133,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 /*
 * Temperature sensors data; must be in same order as enum temp_sensor_id.
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -135,8 +135,8 @@
 #define CONFIG_USB_MUX_PS8740
 #endif
 /* BC 1.2 charger */
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 2
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2

 #ifndef __ASSEMBLER__

--- a/board/poppy/board.c
+++ b/board/poppy/board.c
@@ -377,7 +377,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 /* called from anx74xx_set_power_mode() */
 void board_set_tcpc_power_mode(int port, int mode)
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -161,8 +161,8 @@
 #define CONFIG_USBC_VCONN_SWAP

 /* BC 1.2 charger */
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 2
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2

 /* Optional feature to configure npcx chip */
 #define NPCX_UART_MODULE2	1 /* 1:GPIO64/65 as UART */
--- a/board/rowan/board.c
+++ b/board/rowan/board.c
@@ -135,7 +135,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 /*
 * Temperature sensors data; must be in same order as enum temp_sensor_id.
--- a/board/rowan/board.h
+++ b/board/rowan/board.h
@@ -114,8 +114,8 @@
 #undef CONFIG_UART_RX_DMA

 /* BC 1.2 charger */
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 1
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 1

 /* Optional features */
 #define CONFIG_CMD_CHARGER_ADC_AMON_BMON
--- a/board/ryu/board.c
+++ b/board/ryu/board.c
@@ -131,7 +131,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	}
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 /* Initialize board. */
 static void board_init(void)
--- a/board/ryu/board.h
+++ b/board/ryu/board.h
@@ -48,8 +48,8 @@
 #define CONFIG_USB_PD_TCPC
 #define CONFIG_USB_PD_TCPM_STUB
 #define CONFIG_USB_PD_VBUS_DETECT_GPIO
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 1
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 1
 #define CONFIG_USBC_SS_MUX
 #define CONFIG_USBC_VCONN
 #define CONFIG_USBC_VCONN_SWAP
--- a/board/samus_pd/board.c
+++ b/board/samus_pd/board.c
@@ -82,7 +82,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 static void pericom_port0_reenable_interrupts(void)
 {
--- a/board/samus_pd/board.h
+++ b/board/samus_pd/board.h
@@ -65,8 +65,8 @@
 #define CONFIG_USB_PD_TCPC
 #define CONFIG_USB_PD_TCPM_STUB
 #define CONFIG_USB_PD_VBUS_DETECT_GPIO
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 2
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2
 #define CONFIG_USBC_SS_MUX_DFP_ONLY
 #define CONFIG_USBC_SS_MUX
 #define CONFIG_USBC_VCONN
--- a/board/strago/board.c
+++ b/board/strago/board.c
@@ -130,7 +130,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
 	{
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -44,8 +44,8 @@
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_USB_PD_TRY_SRC
 #define CONFIG_USB_PD_VBUS_DETECT_GPIO
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 1
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 1
 #define CONFIG_USBC_SS_MUX
 #define CONFIG_USBC_SS_MUX_DFP_ONLY
 #define CONFIG_USBC_VCONN
--- a/board/wheatley/board.c
+++ b/board/wheatley/board.c
@@ -158,7 +158,7 @@ struct pi3usb9281_config pi3usb9281_chips[] = {
 	},
 };
 BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) ==
-	     CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	     CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
 	{
--- a/board/wheatley/board.h
+++ b/board/wheatley/board.h
@@ -81,8 +81,8 @@
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_USB_PD_TRY_SRC
 #define CONFIG_USB_PD_VBUS_DETECT_GPIO
-#define CONFIG_USB_SWITCH_PI3USB9281
-#define CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT 2
+#define CONFIG_BC12_DETECT_PI3USB9281
+#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2
 #define CONFIG_USBC_SS_MUX
 #define CONFIG_USBC_SS_MUX_DFP_ONLY
 #define CONFIG_USBC_VCONN
--- a/driver/usb_switch_pi3usb9281.c
+++ b/driver/usb_switch_pi3usb9281.c
@@ -44,7 +44,7 @@ static struct mutex usb_switch_lock[CONFIG_USB_PD_PORT_COUNT];
 static void select_chip(int port)
 {
 	struct pi3usb9281_config *chip = &pi3usb9281_chips[port];
-	ASSERT(port < CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT);
+	ASSERT(port < CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT);

 	if (chip->mux_lock) {
 		mutex_lock(chip->mux_lock);
--- a/driver/build.mk
+++ b/driver/build.mk
@@ -18,6 +18,7 @@ driver-$(CONFIG_ACCEL_LIS2DH)+=accel_lis2dh.o stm_mems_common.o

 # BC1.2 Charger Detection Devices
 driver-$(CONFIG_BC12_DETECT_BQ24392)+=bc12/bq24392.o
+driver-$(CONFIG_BC12_DETECT_PI3USB9281)+=bc12/pi3usb9281.o

 # Gyrometers
 driver-$(CONFIG_GYRO_L3GD20H)+=gyro_l3gd20h.o
@@ -28,7 +29,7 @@ driver-$(CONFIG_ALS_ISL29035)+=als_isl29035.o
 driver-$(CONFIG_ALS_OPT3001)+=als_opt3001.o
 driver-$(CONFIG_ALS_SI114X)+=als_si114x.o

-#Barometers
+# Barometers
 driver-$(CONFIG_BARO_BMP280)+=baro_bmp280.o

 # Batteries
@@ -95,9 +96,6 @@ driver-$(CONFIG_USB_PD_TCPM_ANX7688)+=tcpm/anx7688.o
 driver-$(CONFIG_USB_PD_TCPM_PS8751)+=tcpm/ps8xxx.o
 driver-$(CONFIG_USB_PD_TCPM_PS8805)+=tcpm/ps8xxx.o

-# USB switches
-driver-$(CONFIG_USB_SWITCH_PI3USB9281)+=usb_switch_pi3usb9281.o
-
 # USB mux high-level driver
 driver-$(CONFIG_USBC_SS_MUX)+=usb_mux.o

--- a/include/config.h
+++ b/include/config.h
@@ -2592,6 +2592,10 @@

 /* External BC1.2 charger detection devices. */
 #undef CONFIG_BC12_DETECT_BQ24392
+#undef CONFIG_BC12_DETECT_PI3USB9281
+/* Number of Pericom PI3USB9281 chips present in system */
+#undef CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT
+

 /* Enable USB serial console module. */
 #undef CONFIG_USB_CONSOLE
@@ -2704,12 +2708,6 @@
 /******************************************************************************/
 /* USB port switch */

-/* Support the Pericom PI3USB9281 I2C USB switch */
-#undef CONFIG_USB_SWITCH_PI3USB9281
-
-/* Number of Pericom PI3USB9281 chips present in system */
-#undef CONFIG_USB_SWITCH_PI3USB9281_CHIP_COUNT
-
 /* Support the Pericom PI3USB30532 USB3.0/DP1.2 Matrix Switch */
 #undef CONFIG_USB_MUX_PI3USB30532