From 4a49cb2b747ce30e92bcac4595607ca0d56311bc Mon Sep 17 00:00:00 2001 From: Conor Dooley Date: Tue, 28 Apr 2026 19:11:11 +0100 Subject: [PATCH 1/2] spi: microchip-core-qspi: report device on which timeout occured instead of which controller When prepare_message callbacks fail, the SPI core already reports which controller the failure happened on. The corresponding code in the mem_ops portion of the driver already reports the device a timeout occurred on, so make the regular part of the driver do the same. Signed-off-by: Conor Dooley Signed-off-by: Linux RISC-V bot --- drivers/spi/spi-microchip-core-qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-microchip-core-qspi.c b/drivers/spi/spi-microchip-core-qspi.c index aafe6cbf2aea71..20da01b88b2dea 100644 --- a/drivers/spi/spi-microchip-core-qspi.c +++ b/drivers/spi/spi-microchip-core-qspi.c @@ -604,7 +604,7 @@ static int mchp_coreqspi_prepare_message(struct spi_controller *ctlr, struct spi ret = mchp_coreqspi_wait_for_ready(qspi); if (ret) { mutex_unlock(&qspi->op_lock); - dev_err(&ctlr->dev, "Timeout waiting on QSPI ready.\n"); + dev_err(&m->spi->dev, "Timeout waiting on QSPI ready.\n"); return ret; } From 7a824dce4f729eee8434c3c3096a152f44c3c393 Mon Sep 17 00:00:00 2001 From: Conor Dooley Date: Tue, 28 Apr 2026 19:11:12 +0100 Subject: [PATCH 2/2] spi: microchip-core-qspi: remove an unused define I noticed this define was incorrect, it should be UpperAddress, but in renaming it it became clear there were actually no users. Just get rid of it. Signed-off-by: Conor Dooley Signed-off-by: Linux RISC-V bot --- drivers/spi/spi-microchip-core-qspi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/spi/spi-microchip-core-qspi.c b/drivers/spi/spi-microchip-core-qspi.c index 20da01b88b2dea..daf51046bc6895 100644 --- a/drivers/spi/spi-microchip-core-qspi.c +++ b/drivers/spi/spi-microchip-core-qspi.c @@ -92,7 +92,6 @@ #define REG_IEN (0x0c) #define REG_STATUS (0x10) #define REG_DIRECT_ACCESS (0x14) -#define REG_UPPER_ACCESS (0x18) #define REG_RX_DATA (0x40) #define REG_TX_DATA (0x44) #define REG_X4_RX_DATA (0x48)