diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2017-07-31 11:01:00 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-07-31 17:08:28 -0700 |
| commit | 553d00bdb4e55fdfc5cc75772f686e20cd764c3e (patch) | |
| tree | ad01a5002e717fa05081c238274797ccf52581ce /driver | |
| parent | e67ca7945678399dffa19beb4bd54f7b935e4a7d (diff) | |
| download | chrome-ec-553d00bdb4e55fdfc5cc75772f686e20cd764c3e.tar.gz | |
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>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/bc12/pi3usb9281.c (renamed from driver/usb_switch_pi3usb9281.c) | 2 | ||||
| -rw-r--r-- | driver/build.mk | 6 |
2 files changed, 3 insertions, 5 deletions
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 |