summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/chell/board.c2
-rw-r--r--board/chell/board.h4
-rw-r--r--board/elm/board.c2
-rw-r--r--board/elm/board.h4
-rw-r--r--board/glados/board.c2
-rw-r--r--board/glados/board.h4
-rw-r--r--board/kahlee/board.c2
-rw-r--r--board/kahlee/board.h4
-rw-r--r--board/oak/board.c2
-rw-r--r--board/oak/board.h4
-rw-r--r--board/poppy/board.c2
-rw-r--r--board/poppy/board.h4
-rw-r--r--board/rowan/board.c2
-rw-r--r--board/rowan/board.h4
-rw-r--r--board/ryu/board.c2
-rw-r--r--board/ryu/board.h4
-rw-r--r--board/samus_pd/board.c2
-rw-r--r--board/samus_pd/board.h4
-rw-r--r--board/strago/board.c2
-rw-r--r--board/strago/board.h4
-rw-r--r--board/wheatley/board.c2
-rw-r--r--board/wheatley/board.h4
-rw-r--r--driver/bc12/pi3usb9281.c (renamed from driver/usb_switch_pi3usb9281.c)2
-rw-r--r--driver/build.mk6
-rw-r--r--include/config.h10
25 files changed, 40 insertions, 44 deletions
diff --git a/board/chell/board.c b/board/chell/board.c
index 76edc55a69..e8c013353c 100644
--- 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)
{
diff --git a/board/chell/board.h b/board/chell/board.h
index 9b1cfd8620..4c73cc6c64 100644
--- 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
diff --git a/board/elm/board.c b/board/elm/board.c
index e6734bd4ad..2ec3e08de0 100644
--- 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.
diff --git a/board/elm/board.h b/board/elm/board.h
index ea2452c34a..5fda2789a4 100644
--- 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
diff --git a/board/glados/board.c b/board/glados/board.c
index c666c61712..930a7f8a7d 100644
--- 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] = {
{
diff --git a/board/glados/board.h b/board/glados/board.h
index 9ce659c216..1017ae8721 100644
--- 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
diff --git a/board/kahlee/board.c b/board/kahlee/board.c
index 7d7b3602a2..f95808c4ef 100644
--- 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] = {
diff --git a/board/kahlee/board.h b/board/kahlee/board.h
index 4cec27346e..5012c0b3a0 100644
--- 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
diff --git a/board/oak/board.c b/board/oak/board.c
index afaf16ab13..0c8af7b2ba 100644
--- 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.
diff --git a/board/oak/board.h b/board/oak/board.h
index 6567b6dea5..61eeebf703 100644
--- 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__
diff --git a/board/poppy/board.c b/board/poppy/board.c
index 2a4c17c788..691c229b9e 100644
--- 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)
diff --git a/board/poppy/board.h b/board/poppy/board.h
index daf3cf41b2..841ce21bf2 100644
--- 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 */
diff --git a/board/rowan/board.c b/board/rowan/board.c
index 630a810f1d..957a0bde0d 100644
--- 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.
diff --git a/board/rowan/board.h b/board/rowan/board.h
index 1e6803f24e..859d9a3cb3 100644
--- 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
diff --git a/board/ryu/board.c b/board/ryu/board.c
index 3b85a2df0d..66d2f0e0c7 100644
--- 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)
diff --git a/board/ryu/board.h b/board/ryu/board.h
index 7f04028a82..390086cdec 100644
--- 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
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c
index aa929186f7..aa8e6537dc 100644
--- 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)
{
diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h
index bb60b08e62..36938bda0c 100644
--- 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
diff --git a/board/strago/board.c b/board/strago/board.c
index 7f45ba6661..b2559b47ff 100644
--- 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] = {
{
diff --git a/board/strago/board.h b/board/strago/board.h
index 24a736e585..23100c9a25 100644
--- 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
diff --git a/board/wheatley/board.c b/board/wheatley/board.c
index 0e3772ef2c..79903a505a 100644
--- 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] = {
{
diff --git a/board/wheatley/board.h b/board/wheatley/board.h
index cb38371f7b..18ec83897b 100644
--- 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
diff --git a/driver/usb_switch_pi3usb9281.c b/driver/bc12/pi3usb9281.c
index 39b037cf49..4495b7065b 100644
--- a/driver/usb_switch_pi3usb9281.c
+++ b/driver/bc12/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);
diff --git a/driver/build.mk b/driver/build.mk
index 5448bf5e5c..25a2feaa56 100644
--- 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
diff --git a/include/config.h b/include/config.h
index a912a62f53..5f3b4c0bcb 100644
--- 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
View Lorry Controller Status