[R-6.2.1] uwb: update qm35 driver to release R-6.2.1

Bug: 273393327
Change-Id: I4b2f97b880fe857ff5d1c0ee71ef4972f4d41199
Signed-off-by: Neil DI FOLCO <neil.difolco@qorvo.com>

3 files changed, 6 insertions, 8 deletions

diff --git a/hsspi.c b/hsspi.c
index 2d64a45..3e361c3 100644
--- a/hsspi.c
+++ b/hsspi.c
@@ -223,7 +223,6 @@ static int spi_xfer(struct hsspi *hsspi, const void *tx, void *rx,
 	hsspi->soc->flags = 0;
 	hsspi->soc->ul = 0;
 	hsspi->soc->length = 0;
-	hsspi->xfer_ongoing = true;
 
 	do {
 		ret = hsspi_wait_ss_ready(hsspi);
@@ -252,7 +251,7 @@ static int spi_xfer(struct hsspi *hsspi, const void *tx, void *rx,
 		}
 
 		if (!(hsspi->soc->flags & STC_SOC_RDY) ||
-		    (hsspi->soc->flags == 0xff)) {
+		    (hsspi->soc->flags & 0x0f)) {
 			hsspi->wakeup(hsspi);
 			ret = -EAGAIN;
 			continue;
@@ -261,9 +260,8 @@ static int spi_xfer(struct hsspi *hsspi, const void *tx, void *rx,
 		/* All looks good! */
 		break;
 	} while ((ret == -EAGAIN) && (--retry > 0));
-	hsspi->xfer_ongoing = false;
 
-	if (!(hsspi->soc->flags & STC_SOC_RDY) || (hsspi->soc->flags == 0xff)) {
+	if (!(hsspi->soc->flags & STC_SOC_RDY) || (hsspi->soc->flags & 0x0f)) {
 		dev_err(&hsspi->spi->dev, "FW not ready (flags %#02x)\n",
 			hsspi->soc->flags);
 	}
diff --git a/qm35-spi.c b/qm35-spi.c
index a6cbb76..2de669d 100644
--- a/qm35-spi.c
+++ b/qm35-spi.c
@@ -391,9 +391,6 @@ static irqreturn_t qm35_exton_handler(int irq, void *data)
 {
 	struct qm35_ctx *qm35_hdl = data;
 
-	if (qm35_hdl->hsspi.xfer_ongoing)
-		qm35_wakeup(&qm35_hdl->hsspi);
-
 	hsspi_clear_spi_slave_ready(&qm35_hdl->hsspi);
 	return IRQ_HANDLED;
 }
@@ -851,7 +848,7 @@ static int qm35_probe(struct spi_device *spi)
 
 	dev_info(&spi->dev, "Registered: [%s] misc device\n", uci_misc->name);
 
-	dev_info(&spi->dev, "QM35 spi driver probed\n");
+	dev_info(&spi->dev, "QM35 spi driver version " DRV_VERSION " probed\n");
 	return 0;
 
 log_layer_unregister:
@@ -914,3 +911,4 @@ module_spi_driver(qm35_spi_driver);
 MODULE_AUTHOR("Qorvo US, Inc.");
 MODULE_DESCRIPTION("QM35 SPI device interface");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
diff --git a/qm35.h b/qm35.h
index 1152b46..0cf2f71 100644
--- a/qm35.h
+++ b/qm35.h
@@ -24,6 +24,8 @@
 #define QM_BOOT_MS 450
 #define QM_BEFORE_RESET_MS 450
 
+#define DRV_VERSION "6.2.1-rc1"
+
 struct regulator;
 
 /**