Merge "soc: swr-mstr: Fix headset not detetcted issue on devnum 0 detached" (cc808be9) · Commits · e / devices / android_kernel_fairphone_FP4

soc/swr-mstr-ctrl.c

+16 −2

Original line number	Diff line number	Diff line
		@@ -1636,9 +1636,12 @@ static void swrm_enable_slave_irq(struct swr_mstr_ctrl *swrm)
		}
		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)
		if (status & SWRM_MCP_SLV_STATUS_MASK) {
		swrm_cmd_fifo_wr_cmd(swrm, 0xFF, i, 0x0,
		SWRS_SCP_INT_STATUS_CLEAR_1);
		swrm_cmd_fifo_wr_cmd(swrm, 0x4, i, 0x0,
		SWRS_SCP_INT_STATUS_MASK_1);
		}
		status >>= 2;
		}
		}
		@@ -1943,6 +1946,17 @@ static irqreturn_t swr_mstr_interrupt_v2(int irq, void *dev)
		dev_dbg(swrm->dev,
		"%s: device %d got detached\n",
		__func__, devnum);
		if (devnum == 0) {
		/*
		* enable host irq if device 0 detached
		* 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);
		}
		break;
		case SWR_ATTACHED_OK:
		dev_dbg(swrm->dev,