Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec0d9f5e authored by Vatsal Bucha's avatar Vatsal Bucha Committed by Gerrit - the friendly Code Review server
Browse files

soc: swr-mstr: Fix headset detect issue due to master.num_dev not updated 



Headset is not detected sometimes due to master.num_dev not being
updated when we call GET_ENUM_SLAVE_STATUS as get_logical address
may not have been called. Also enable slave irq only when
swr wokeup from clk stop and not when master is already up.
This will prevent valid irq to be discarded as spurious irq.

Change-Id: I00284e9340668c853d0bd604fe66801118982780
Signed-off-by: default avatarVatsal Bucha <vbucha@codeaurora.org>
parent 08747bef

soc/swr-mstr-ctrl.c

+11 −8
Original line number Diff line number Diff line
@@ -2161,20 +2161,21 @@ static irqreturn_t swr_mstr_interrupt_v2(int irq, void *dev) 
		case SWRM_INTERRUPT_STATUS_CLK_STOP_FINISHED_V2:

			break;

		case SWRM_INTERRUPT_STATUS_EXT_CLK_STOP_WAKEUP:

			if (swrm->state == SWR_MSTR_UP)

			if (swrm->state == SWR_MSTR_UP) {

				dev_dbg(swrm->dev,

					"%s:SWR Master is already up\n",

					__func__);

			else

			} else {

				dev_err_ratelimited(swrm->dev,

					"%s: SWR wokeup during clock stop\n",

					__func__);

			/* It might be possible the slave device gets reset

			 * and slave interrupt gets missed. So re-enable

			 * Host IRQ and process slave pending

				/* It might be possible the slave device gets

				 * reset and slave interrupt gets missed. So

				 * re-enable Host IRQ and process slave pending

				 * interrupts, if any.

				 */

				swrm_enable_slave_irq(swrm);

			}

			break;

		default:

			dev_err_ratelimited(swrm->dev,
@@ -2659,6 +2660,8 @@ static int swrm_probe(struct platform_device *pdev) 
				SWRM_NUM_AUTO_ENUM_SLAVES);

			ret = -EINVAL;

			goto err_pdata_fail;

		} else {

			swrm->master.num_dev = swrm->num_dev;

		}

	}