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

Commit 7ec93a3c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd937x: Fix spurious interrupts for wcd937x"

parents 7d22ca73 875812d3

asoc/codecs/wcd937x/wcd937x.c

+26 −4
Original line number Diff line number Diff line
@@ -688,8 +688,12 @@ static int wcd937x_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
			wcd937x->update_wcd_event(wcd937x->handle,

						WCD_BOLERO_EVT_RX_MUTE,

						(WCD_RX2 << 0x10));

		wcd_enable_irq(&wcd937x->irq_info,

				WCD937X_IRQ_HPHR_PDM_WD_INT);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		wcd_disable_irq(&wcd937x->irq_info,

				WCD937X_IRQ_HPHR_PDM_WD_INT);

		if (wcd937x->update_wcd_event)

			wcd937x->update_wcd_event(wcd937x->handle,

						WCD_BOLERO_EVT_RX_MUTE,
@@ -783,8 +787,12 @@ static int wcd937x_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
			wcd937x->update_wcd_event(wcd937x->handle,

						WCD_BOLERO_EVT_RX_MUTE,

						(WCD_RX1 << 0x10));

		wcd_enable_irq(&wcd937x->irq_info,

				WCD937X_IRQ_HPHL_PDM_WD_INT);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		wcd_disable_irq(&wcd937x->irq_info,

				WCD937X_IRQ_HPHL_PDM_WD_INT);

		if (wcd937x->update_wcd_event)

			wcd937x->update_wcd_event(wcd937x->handle,

						WCD_BOLERO_EVT_RX_MUTE,
@@ -855,8 +863,10 @@ static int wcd937x_codec_enable_aux_pa(struct snd_soc_dapm_widget *w, 
			wcd937x->update_wcd_event(wcd937x->handle,

						WCD_BOLERO_EVT_RX_MUTE,

						(WCD_RX3 << 0x10));

		wcd_enable_irq(&wcd937x->irq_info, WCD937X_IRQ_AUX_PDM_WD_INT);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		wcd_disable_irq(&wcd937x->irq_info, WCD937X_IRQ_AUX_PDM_WD_INT);

		if (wcd937x->update_wcd_event)

			wcd937x->update_wcd_event(wcd937x->handle,

						WCD_BOLERO_EVT_RX_MUTE,
@@ -923,8 +933,20 @@ static int wcd937x_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
			wcd937x->update_wcd_event(wcd937x->handle,

						WCD_BOLERO_EVT_RX_MUTE,

						(WCD_RX1 << 0x10));

		if (wcd937x->ear_rx_path & EAR_RX_PATH_AUX)

			wcd_enable_irq(&wcd937x->irq_info,

					WCD937X_IRQ_AUX_PDM_WD_INT);

		else

			wcd_enable_irq(&wcd937x->irq_info,

					WCD937X_IRQ_HPHL_PDM_WD_INT);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		if (wcd937x->ear_rx_path & EAR_RX_PATH_AUX)

			wcd_disable_irq(&wcd937x->irq_info,

					WCD937X_IRQ_AUX_PDM_WD_INT);

		else

			wcd_disable_irq(&wcd937x->irq_info,

					WCD937X_IRQ_HPHL_PDM_WD_INT);

		if (wcd937x->update_wcd_event)

			wcd937x->update_wcd_event(wcd937x->handle,

						WCD_BOLERO_EVT_RX_MUTE,
@@ -2849,10 +2871,10 @@ static int wcd937x_bind(struct device *dev) 
			"HPHL PDM WD INT", wcd937x_wd_handle_irq, NULL);

	wcd_request_irq(&wcd937x->irq_info, WCD937X_IRQ_AUX_PDM_WD_INT,

			"AUX PDM WD INT", wcd937x_wd_handle_irq, NULL);

	/* Enable watchdog interrupt for HPH and AUX */

	wcd_enable_irq(&wcd937x->irq_info, WCD937X_IRQ_HPHR_PDM_WD_INT);

	wcd_enable_irq(&wcd937x->irq_info, WCD937X_IRQ_HPHL_PDM_WD_INT);

	wcd_enable_irq(&wcd937x->irq_info, WCD937X_IRQ_AUX_PDM_WD_INT);

	/* Disable watchdog interrupt for HPH and AUX */

	wcd_disable_irq(&wcd937x->irq_info, WCD937X_IRQ_HPHR_PDM_WD_INT);

	wcd_disable_irq(&wcd937x->irq_info, WCD937X_IRQ_HPHL_PDM_WD_INT);

	wcd_disable_irq(&wcd937x->irq_info, WCD937X_IRQ_AUX_PDM_WD_INT);



	ret = snd_soc_register_component(dev, &soc_codec_dev_wcd937x,

				     NULL, 0);

asoc/codecs/wcd938x/wcd938x.c

+12 −0
Original line number Diff line number Diff line
@@ -976,8 +976,20 @@ static int wcd938x_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
			wcd938x->update_wcd_event(wcd938x->handle,

						WCD_BOLERO_EVT_RX_MUTE,

						(WCD_RX1 << 0x10));

		if (wcd938x->ear_rx_path & EAR_RX_PATH_AUX)

			wcd_enable_irq(&wcd938x->irq_info,

					WCD938X_IRQ_AUX_PDM_WD_INT);

		else

			wcd_enable_irq(&wcd938x->irq_info,

					WCD938X_IRQ_HPHL_PDM_WD_INT);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		if (wcd938x->ear_rx_path & EAR_RX_PATH_AUX)

			wcd_disable_irq(&wcd938x->irq_info,

					WCD938X_IRQ_AUX_PDM_WD_INT);

		else

			wcd_disable_irq(&wcd938x->irq_info,

					WCD938X_IRQ_HPHL_PDM_WD_INT);

		if (wcd938x->update_wcd_event)

			wcd938x->update_wcd_event(wcd938x->handle,

						WCD_BOLERO_EVT_RX_MUTE,