diff options
| author | Craig Hesling <hesling@chromium.org> | 2021-04-26 15:17:22 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-29 00:17:42 +0000 |
| commit | 255a07f57d811080533664f87ebb3138794f0987 (patch) | |
| tree | b4a6fc6904e6aeef502f651ac76508e8485a25db /util/flash_fp_mcu | |
| parent | 6a0f8c27a341ac7a2dce2cd21c885f76900c327b (diff) | |
| download | chrome-ec-255a07f57d811080533664f87ebb3138794f0987.tar.gz | |
flash_fp_mcu: Change to simpler driver_override for spidev
This allows for reverting the spidev fallback hack, which overwrites
the user visible modalias on ARM.
https://crrev.com/c/2715605
BRANCH=none
BUG=b:179533783
TEST=scp util/flash_fp_mcu dut1:/usr/local/bin/flash_fp_mcu
ssh dut1 flash_fp_mcu --hello
TEST=# Same thing as above, but more generic.
tast run -var=servo=localhost:9999 dut1 \
firmware.FpFlashFpMcuHello
Cq-Depend: chromium:2851901
Change-Id: I221da42778f5bb31d8dc84fb39ff939fd55b3ed1
Signed-off-by: Craig Hesling <hesling@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2851634
Diffstat (limited to 'util/flash_fp_mcu')
| -rw-r--r-- | util/flash_fp_mcu | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/flash_fp_mcu b/util/flash_fp_mcu index 569365734d..0f6b8e33bc 100644 --- a/util/flash_fp_mcu +++ b/util/flash_fp_mcu @@ -278,8 +278,7 @@ flash_fp_mcu_stm32() { echo AMDI0020:01 > /sys/bus/platform/drivers/dw-apb-uart/unbind; echo AMDI0020:01 > /sys/bus/platform/drivers/dw-apb-uart/bind; else - # load spidev (fail on cros-ec-spi first to change modalias) - echo "${deviceid}" > /sys/bus/spi/drivers/cros-ec-spi/bind 2>/dev/null + echo spidev > "/sys/bus/spi/devices/${deviceid}/driver_override" echo "${deviceid}" > /sys/bus/spi/drivers/spidev/bind # The following sleep is a workaround to mitigate the effects of a # poorly behaved chip select line. See b/145023809. @@ -358,6 +357,7 @@ flash_fp_mcu_stm32() { # Put back cros_fp driver if transport is SPI if [[ "${transport}" != "UART" ]]; then + echo "" > "/sys/bus/spi/devices/${deviceid}/driver_override" echo "${deviceid}" > /sys/bus/spi/drivers/cros-ec-spi/bind # Kernel driver is back, we are no longer controlling power |