Merge "soc: swr-mstr: update component and interrupt enable sequence"
diff --git a/asoc/msm-pcm-q6-noirq.c b/asoc/msm-pcm-q6-noirq.c
index e3f59e8..7338013 100644
--- a/asoc/msm-pcm-q6-noirq.c
+++ b/asoc/msm-pcm-q6-noirq.c
@@ -730,6 +730,12 @@
pr_err("%s: vol is NULL\n", __func__);
return -ENODEV;
}
+
+ if (!vol->pcm) {
+ pr_err("%s: vol->pcm is NULL\n", __func__);
+ return -ENODEV;
+ }
+
substream = vol->pcm->streams[vol->stream].substream;
if (!substream) {
pr_err("%s substream not found\n", __func__);
diff --git a/asoc/msm-pcm-q6-v2.c b/asoc/msm-pcm-q6-v2.c
index 1592c3f..de28f65 100644
--- a/asoc/msm-pcm-q6-v2.c
+++ b/asoc/msm-pcm-q6-v2.c
@@ -1534,6 +1534,12 @@
pr_err("%s: vol is NULL\n", __func__);
return -ENODEV;
}
+
+ if (!vol->pcm) {
+ pr_err("%s: vol->pcm is NULL\n", __func__);
+ return -ENODEV;
+ }
+
substream = vol->pcm->streams[vol->stream].substream;
if (!substream) {
pr_err("%s substream not found\n", __func__);
diff --git a/soc/swr-mstr-ctrl.c b/soc/swr-mstr-ctrl.c
index a489be1..e200a70 100644
--- a/soc/swr-mstr-ctrl.c
+++ b/soc/swr-mstr-ctrl.c
@@ -1744,6 +1744,7 @@
{
int i;
int status = 0;
+ u32 temp;
status = swr_master_read(swrm, SWRM_MCP_SLV_STATUS);
if (!status) {
@@ -1754,6 +1755,8 @@
dev_dbg(swrm->dev, "%s: slave status: 0x%x\n", __func__, status);
for (i = 0; i < (swrm->master.num_dev + 1); i++) {
if (status & SWRM_MCP_SLV_STATUS_MASK) {
+ swrm_cmd_fifo_rd_cmd(swrm, &temp, i, 0x0,
+ SWRS_SCP_INT_STATUS_CLEAR_1, 1);
swrm_cmd_fifo_wr_cmd(swrm, 0xFF, i, 0x0,
SWRS_SCP_INT_STATUS_CLEAR_1);
swrm_cmd_fifo_wr_cmd(swrm, 0x4, i, 0x0,
@@ -2069,10 +2072,7 @@
* as hw will mask host_irq at slave
* but will not unmask it afterwards.
*/
- swrm_cmd_fifo_wr_cmd(swrm, 0xFF, devnum, 0x0,
- SWRS_SCP_INT_STATUS_CLEAR_1);
- swrm_cmd_fifo_wr_cmd(swrm, 0x4, devnum, 0x0,
- SWRS_SCP_INT_STATUS_MASK_1);
+ swrm->enable_slave_irq = true;
}
break;
case SWR_ATTACHED_OK:
@@ -2080,11 +2080,7 @@
"%s: device %d got attached\n",
__func__, devnum);
/* enable host irq from slave device*/
- swrm_cmd_fifo_wr_cmd(swrm, 0xFF, devnum, 0x0,
- SWRS_SCP_INT_STATUS_CLEAR_1);
- swrm_cmd_fifo_wr_cmd(swrm, 0x4, devnum, 0x0,
- SWRS_SCP_INT_STATUS_MASK_1);
-
+ swrm->enable_slave_irq = true;
break;
case SWR_ALERT:
dev_dbg(swrm->dev,
@@ -2187,6 +2183,12 @@
swr_master_write(swrm, SWRM_INTERRUPT_CLEAR, intr_sts);
swr_master_write(swrm, SWRM_INTERRUPT_CLEAR, 0x0);
+ if (swrm->enable_slave_irq) {
+ /* Enable slave irq here */
+ swrm_enable_slave_irq(swrm);
+ swrm->enable_slave_irq = false;
+ }
+
intr_sts = swr_master_read(swrm, SWRM_INTERRUPT_STATUS);
intr_sts_masked = intr_sts & swrm->intr_mask;
diff --git a/soc/swr-mstr-ctrl.h b/soc/swr-mstr-ctrl.h
index 51b3538..f536592 100644
--- a/soc/swr-mstr-ctrl.h
+++ b/soc/swr-mstr-ctrl.h
@@ -184,6 +184,7 @@
u32 disable_div2_clk_switch;
u32 rd_fifo_depth;
u32 wr_fifo_depth;
+ bool enable_slave_irq;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_swrm_dent;
struct dentry *debugfs_peek;