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

Commit c098c049 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 38e81d82 on remote branch 

Change-Id: I9f051db786269969ec94ec0ef2560e1117cd93ab
parents 9d63d445 38e81d82

asoc/msm-dai-q6-v2.c

+3 −3
Original line number Diff line number Diff line
@@ -3896,20 +3896,20 @@ static const struct snd_kcontrol_new rt_proxy_config_controls[] = { 
};



static const struct snd_kcontrol_new usb_audio_cfg_controls[] = {

	SOC_SINGLE_EXT("USB_AUDIO_RX dev_token", 0, 0, UINT_MAX, 0,

	SOC_SINGLE_EXT("USB_AUDIO_RX dev_token", 0, 0, INT_MAX, 0,

			msm_dai_q6_usb_audio_cfg_get,

			msm_dai_q6_usb_audio_cfg_put),

	SOC_SINGLE_EXT("USB_AUDIO_RX endian", 0, 0, 1, 0,

			msm_dai_q6_usb_audio_endian_cfg_get,

			msm_dai_q6_usb_audio_endian_cfg_put),

	SOC_SINGLE_EXT("USB_AUDIO_TX dev_token", 0, 0, UINT_MAX, 0,

	SOC_SINGLE_EXT("USB_AUDIO_TX dev_token", 0, 0, INT_MAX, 0,

			msm_dai_q6_usb_audio_cfg_get,

			msm_dai_q6_usb_audio_cfg_put),

	SOC_SINGLE_EXT("USB_AUDIO_TX endian", 0, 0, 1, 0,

			msm_dai_q6_usb_audio_endian_cfg_get,

			msm_dai_q6_usb_audio_endian_cfg_put),

	SOC_SINGLE_EXT("USB_AUDIO_RX service_interval", SND_SOC_NOPM, 0,

			UINT_MAX, 0,

			INT_MAX, 0,

			msm_dai_q6_usb_audio_svc_interval_get,

			msm_dai_q6_usb_audio_svc_interval_put),

};

asoc/msm-pcm-q6-noirq.c

+14 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ static const struct soc_enum msm_pcm_fe_topology_enum[] = { 
static void event_handler(uint32_t opcode,

		uint32_t token, uint32_t *payload, void *priv)

{

	struct msm_audio *prtd = priv;

	struct snd_pcm_substream *substream;

	uint32_t *ptrmem = (uint32_t *)payload;



	switch (opcode) {
@@ -171,6 +173,18 @@ static void event_handler(uint32_t opcode, 
			break;

		}

		break;

	case RESET_EVENTS:

		if (!prtd || !prtd->substream) {

			pr_err("%s: prtd or substream is NULL\n", __func__);

			return;

		}

		substream = prtd->substream;

		if (!substream->runtime || !substream->runtime->status) {

			pr_err("%s: runtime or runtime->status is NULL\n", __func__);

			return;

		}

		substream->runtime->status->state = SNDRV_PCM_STATE_DISCONNECTED;

		break;

	default:

		pr_debug("Not Supported Event opcode[0x%x]\n", opcode);

		break;