1 files changed, 28 insertions, 3 deletions

diff --git a/sound/soc/codecs/wcd-spi.c b/sound/soc/codecs/wcd-spi.c
index 3049d87c6c05..60efcb174740 100644
--- a/sound/soc/codecs/wcd-spi.c
+++ b/sound/soc/codecs/wcd-spi.c
@@ -639,12 +639,10 @@ static int wcd_spi_init(struct spi_device *spi)
 			   WCD_SPI_SLAVE_TRNS_LEN,
 			   0xFFFF0000,
 			   (WCD_SPI_RW_MULTI_MAX_LEN / 4) << 16);
-done:
-	return ret;
-
 err_wr_en:
 	wcd_spi_clk_ctrl(spi, WCD_SPI_CLK_DISABLE,
 			 WCD_SPI_CLK_FLAG_IMMEDIATE);
+done:
 	return ret;
 }
 
@@ -813,6 +811,27 @@ static int wdsp_spi_dload_section(struct spi_device *spi,
 	return ret;
 }
 
+static int wdsp_spi_read_section(struct spi_device *spi, void *data)
+{
+	struct wcd_spi_priv *wcd_spi = spi_get_drvdata(spi);
+	struct wdsp_img_section *sec = data;
+	struct wcd_spi_msg msg;
+	int ret;
+
+	msg.remote_addr = sec->addr + wcd_spi->mem_base_addr;
+	msg.data = sec->data;
+	msg.len = sec->size;
+
+	dev_dbg(&spi->dev, "%s: addr = 0x%x, size = 0x%zx\n",
+		__func__, msg.remote_addr, msg.len);
+
+	ret = wcd_spi_data_xfer(spi, &msg, WCD_SPI_XFER_READ);
+	if (IS_ERR_VALUE(ret))
+		dev_err(&spi->dev, "%s: fail addr (0x%x) size (0x%zx)\n",
+			__func__, msg.remote_addr, msg.len);
+	return ret;
+}
+
 static int wdsp_spi_event_handler(struct device *dev, void *priv_data,
 				  enum wdsp_event_type event,
 				  void *data)
@@ -824,6 +843,7 @@ static int wdsp_spi_event_handler(struct device *dev, void *priv_data,
 		__func__, event);
 
 	switch (event) {
+	case WDSP_EVENT_PRE_DLOAD_CODE:
 	case WDSP_EVENT_PRE_DLOAD_DATA:
 		ret = wcd_spi_clk_ctrl(spi, WCD_SPI_CLK_ENABLE,
 				       WCD_SPI_CLK_FLAG_IMMEDIATE);
@@ -846,6 +866,11 @@ static int wdsp_spi_event_handler(struct device *dev, void *priv_data,
 	case WDSP_EVENT_DLOAD_SECTION:
 		ret = wdsp_spi_dload_section(spi, data);
 		break;
+
+	case WDSP_EVENT_READ_SECTION:
+		ret = wdsp_spi_read_section(spi, data);
+		break;
+
 	default:
 		dev_dbg(&spi->dev, "%s: Unhandled event %d\n",
 			__func__, event);