From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 553463DFC69 for ; Wed, 4 Mar 2026 19:59:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772654362; cv=none; b=kGNzeZbV7T0SJCkBPcb/JbnfhGnKfaU3rAh5GFb/w6rS3aq2QiFqPhF23JlWX+19jtCphBxK9REqIFpBSwxN7ioulRdcBYTGV8R2E0XjNlXbB4Tu0O1Kzr5iKmGByMFag5O2/IVY+gsZBmnhNvKjOArORBlr+Fmrfa5d5DOY06A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772654362; c=relaxed/simple; bh=NTLYLQFXzthunQAVwPc0tHdCrO0Rc+WOiGk7EDUWulU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FIEWxmXjDjWL/sfL/qhbIT0AReEGbABqS00Dn476igJyLUr3Xij3M7JnfVW66Tu4GE8cAzP7VyCCxfl9kGSO1CPHVqd63FUkMqsP2Q273+AJ2x6WK1w4PsWPEtIEYlFhad9Svb8BN69P+7nQVL+Dj1fObbmlIOukrwSy9sXNg6M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=e873Yt/t; arc=none smtp.client-ip=209.85.219.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e873Yt/t" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-89a000f5adeso61893896d6.3 for ; Wed, 04 Mar 2026 11:59:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772654360; x=1773259160; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ko8pkaQ/h2+Vf8CzfWT1kqph029g9HoONI/ib77Rfy4=; b=e873Yt/tyw7nfn7n4Ss1U5K3Kgb4/k43wdD3vTvUEJluzp/SRLDD3K5hBHRB7DFGvQ H/HtsfBwpCDDcZhGxA1Xrqq6lOyR3QtbYv5GTtnt+FjgCYzcbexLUI+h1tFgt08DXyJd OLkMTMxiU54IunUy5HTnJn+QYFh7b3F7xl2jGT8maN2LMJGvo/EWezsfkdHtTK6JZR0v bweCoNybPb2T+G9OxsSuDW4FN5KIVtyTgq5IY8KP6IGWnprHCmjTYXINIsiLRme13fD9 W6sbxD9tHRATrvphppJ0L4iC6YR76iqYD9yAQ7UwC+p9t4pO5eU5aTQzlk6i1a7d7+dL YPlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772654360; x=1773259160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ko8pkaQ/h2+Vf8CzfWT1kqph029g9HoONI/ib77Rfy4=; b=kLoGPBqIQj/Ey+JslBaZPwxBD5DgmFjnYfw9Hwqe6BPYVc2DsFPLw1KyJR+EiGp4vs Z6Wldmdf/N0PeLqUWqwpZVb0ujGE8kelWjDiHFlx4exp/4sf9BuSntRqMrfPaK43aVe6 RRuINuKr+xg2tBtXxgHjM9zPn3gwsXOpDk/96PA96nxc36PYbAJPy7uWZ8+l8X+7qUa3 G4VHMTCYoczV/PvO1QrmHxGIxxidLFeEaLeehYv0LuOpq/4B/PHLT53vepgxC/lJx3jQ O4ccDAiLBnFFp0QDB9xK9weKV/WhX44GaT+Ek1Sn1B9sf/kQJoij7uYqWTG3muAq9fB1 1XZA== X-Forwarded-Encrypted: i=1; AJvYcCWFkW22u4QQepDnyRqrvjSmhLdSqMH/u25EHPFyzwwvRVrNtXrmzMfKbgxvVJgbOQNRQgW6ZhPA6cl2@vger.kernel.org X-Gm-Message-State: AOJu0YwxBx+rnqjehFccrTOZRIuB6GmLKnjXlmvaUql1Splx/SGor4db dK8jgUQ2umtnZF344GyxWb74engHkW+cXQP692UyV6a+xr9yEyS0nZmh X-Gm-Gg: ATEYQzyYS/GGvsqrtQKb+3Kcgw/312CZBlRCeMxqwm/ijSRNdZgKgafneF/n0FA2Sdv xfub+pJCmbqBoQjQH9qKXvFGXnIJn+cxDeLb4K+wsJpQzHg5OLAYe637xdD1fdn9DwBhcmjzgYb tafvjaXfJcVRvGlNdpQDDE8qmbeNAF1qSeuPhxaH+106j9X7nBFnkH/ZV5h4sdYCLOny+d/p0pd H0MCafL+HpHOnwsl6GFkrjxcMZ1Ez2zvwT0HqrypwU4NoS4tG7eSvbtGsGrpx9enr5kMPYEX3qS IT8nYpE2T7JpeMjByqAp+KBVKVPCwOXhTu3TfOiyfuSKsOKuc0yV4ClpljDEObCXXOyKkETu2/D ebCrvbYkkVgI8kJgiBwDz5Hl7uF1dAiEvfR9SKgh7RS2thU+cfVSrbEzgLLZP04Rnxun/YAT9ii 1tmWf2/UDFCtTzzg4+O9x6EPhfJA== X-Received: by 2002:a05:6214:cab:b0:89a:3c4:5161 with SMTP id 6a1803df08f44-89a19d0cdfcmr49804056d6.59.1772654360308; Wed, 04 Mar 2026 11:59:20 -0800 (PST) Received: from localhost ([184.144.58.243]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-89a09ffa5e1sm46324076d6.21.2026.03.04.11.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 11:59:19 -0800 (PST) From: Richard Acayan To: Srinivas Kandagatla , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, devicetree@vger.kernel.org Cc: Nickolay Goppen , Wesley Cheng , Greg Kroah-Hartman , Johan Hovold , Kees Cook , Charles Keepax , Kuninori Morimoto , Richard Acayan Subject: [PATCH v2 08/11] ASoC: qdsp6: q6routing: add internal mi2s support Date: Wed, 4 Mar 2026 14:58:12 -0500 Message-ID: <20260304195815.52347-9-mailingradian@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260304195815.52347-1-mailingradian@gmail.com> References: <20260304195815.52347-1-mailingradian@gmail.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add the ASM-AFE routing for internal MI2S ports. Signed-off-by: Richard Acayan --- sound/soc/qcom/qdsp6/q6routing.c | 78 +++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index 7386226046fa..cfb953700f14 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c @@ -127,7 +127,14 @@ { mix_name, "TX_CODEC_DMA_TX_2", "TX_CODEC_DMA_TX_2"}, \ { mix_name, "TX_CODEC_DMA_TX_3", "TX_CODEC_DMA_TX_3"}, \ { mix_name, "TX_CODEC_DMA_TX_4", "TX_CODEC_DMA_TX_4"}, \ - { mix_name, "TX_CODEC_DMA_TX_5", "TX_CODEC_DMA_TX_5"} + { mix_name, "TX_CODEC_DMA_TX_5", "TX_CODEC_DMA_TX_5"}, \ + { mix_name, "INT0_MI2S_TX", "INT0_MI2S_TX" }, \ + { mix_name, "INT1_MI2S_TX", "INT1_MI2S_TX" }, \ + { mix_name, "INT2_MI2S_TX", "INT2_MI2S_TX" }, \ + { mix_name, "INT3_MI2S_TX", "INT3_MI2S_TX" }, \ + { mix_name, "INT4_MI2S_TX", "INT4_MI2S_TX" }, \ + { mix_name, "INT5_MI2S_TX", "INT5_MI2S_TX" }, \ + { mix_name, "INT6_MI2S_TX", "INT6_MI2S_TX" } #define Q6ROUTING_TX_MIXERS(id) \ SOC_SINGLE_EXT("PRI_MI2S_TX", PRIMARY_MI2S_TX, \ @@ -320,6 +327,27 @@ id, 1, 0, msm_routing_get_audio_mixer, \ msm_routing_put_audio_mixer), \ SOC_SINGLE_EXT("TX_CODEC_DMA_TX_5", TX_CODEC_DMA_TX_5, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("INT0_MI2S_TX", INT0_MI2S_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("INT1_MI2S_TX", INT1_MI2S_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("INT2_MI2S_TX", INT2_MI2S_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("INT3_MI2S_TX", INT3_MI2S_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("INT4_MI2S_TX", INT4_MI2S_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("INT5_MI2S_TX", INT5_MI2S_TX, \ + id, 1, 0, msm_routing_get_audio_mixer, \ + msm_routing_put_audio_mixer), \ + SOC_SINGLE_EXT("INT6_MI2S_TX", INT6_MI2S_TX, \ id, 1, 0, msm_routing_get_audio_mixer, \ msm_routing_put_audio_mixer), @@ -709,6 +737,26 @@ static const struct snd_kcontrol_new rxcodec_dma_rx_6_mixer_controls[] = { static const struct snd_kcontrol_new rx_codec_dma_rx_7_mixer_controls[] = { Q6ROUTING_RX_MIXERS(RX_CODEC_DMA_RX_7) }; +static const struct snd_kcontrol_new int0_mi2s_rx_mixer_controls[] = { + Q6ROUTING_RX_MIXERS(INT0_MI2S_RX) }; + +static const struct snd_kcontrol_new int1_mi2s_rx_mixer_controls[] = { + Q6ROUTING_RX_MIXERS(INT1_MI2S_RX) }; + +static const struct snd_kcontrol_new int2_mi2s_rx_mixer_controls[] = { + Q6ROUTING_RX_MIXERS(INT2_MI2S_RX) }; + +static const struct snd_kcontrol_new int3_mi2s_rx_mixer_controls[] = { + Q6ROUTING_RX_MIXERS(INT3_MI2S_RX) }; + +static const struct snd_kcontrol_new int4_mi2s_rx_mixer_controls[] = { + Q6ROUTING_RX_MIXERS(INT4_MI2S_RX) }; + +static const struct snd_kcontrol_new int5_mi2s_rx_mixer_controls[] = { + Q6ROUTING_RX_MIXERS(INT5_MI2S_RX) }; + +static const struct snd_kcontrol_new int6_mi2s_rx_mixer_controls[] = { + Q6ROUTING_RX_MIXERS(INT6_MI2S_RX) }; static const struct snd_kcontrol_new mmul1_mixer_controls[] = { Q6ROUTING_TX_MIXERS(MSM_FRONTEND_DAI_MULTIMEDIA1) }; @@ -938,6 +986,27 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { SND_SOC_DAPM_MIXER("USB_RX Audio Mixer", SND_SOC_NOPM, 0, 0, usb_rx_mixer_controls, ARRAY_SIZE(usb_rx_mixer_controls)), + SND_SOC_DAPM_MIXER("INT0_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + int0_mi2s_rx_mixer_controls, + ARRAY_SIZE(int0_mi2s_rx_mixer_controls)), + SND_SOC_DAPM_MIXER("INT1_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + int1_mi2s_rx_mixer_controls, + ARRAY_SIZE(int1_mi2s_rx_mixer_controls)), + SND_SOC_DAPM_MIXER("INT2_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + int2_mi2s_rx_mixer_controls, + ARRAY_SIZE(int2_mi2s_rx_mixer_controls)), + SND_SOC_DAPM_MIXER("INT3_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + int3_mi2s_rx_mixer_controls, + ARRAY_SIZE(int3_mi2s_rx_mixer_controls)), + SND_SOC_DAPM_MIXER("INT4_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + int4_mi2s_rx_mixer_controls, + ARRAY_SIZE(int4_mi2s_rx_mixer_controls)), + SND_SOC_DAPM_MIXER("INT5_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + int5_mi2s_rx_mixer_controls, + ARRAY_SIZE(int5_mi2s_rx_mixer_controls)), + SND_SOC_DAPM_MIXER("INT6_MI2S_RX Audio Mixer", SND_SOC_NOPM, 0, 0, + int6_mi2s_rx_mixer_controls, + ARRAY_SIZE(int6_mi2s_rx_mixer_controls)), SND_SOC_DAPM_MIXER("MultiMedia1 Mixer", SND_SOC_NOPM, 0, 0, mmul1_mixer_controls, ARRAY_SIZE(mmul1_mixer_controls)), SND_SOC_DAPM_MIXER("MultiMedia2 Mixer", SND_SOC_NOPM, 0, 0, @@ -1031,6 +1100,13 @@ static const struct snd_soc_dapm_route intercon[] = { Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_6 Audio Mixer", "RX_CODEC_DMA_RX_6"), Q6ROUTING_RX_DAPM_ROUTE("RX_CODEC_DMA_RX_7 Audio Mixer", "RX_CODEC_DMA_RX_7"), Q6ROUTING_RX_DAPM_ROUTE("USB_RX Audio Mixer", "USB_RX"), + Q6ROUTING_RX_DAPM_ROUTE("INT0_MI2S_RX Audio Mixer", "INT0_MI2S_RX"), + Q6ROUTING_RX_DAPM_ROUTE("INT1_MI2S_RX Audio Mixer", "INT1_MI2S_RX"), + Q6ROUTING_RX_DAPM_ROUTE("INT2_MI2S_RX Audio Mixer", "INT2_MI2S_RX"), + Q6ROUTING_RX_DAPM_ROUTE("INT3_MI2S_RX Audio Mixer", "INT3_MI2S_RX"), + Q6ROUTING_RX_DAPM_ROUTE("INT4_MI2S_RX Audio Mixer", "INT4_MI2S_RX"), + Q6ROUTING_RX_DAPM_ROUTE("INT5_MI2S_RX Audio Mixer", "INT5_MI2S_RX"), + Q6ROUTING_RX_DAPM_ROUTE("INT6_MI2S_RX Audio Mixer", "INT6_MI2S_RX"), Q6ROUTING_TX_DAPM_ROUTE("MultiMedia1 Mixer"), Q6ROUTING_TX_DAPM_ROUTE("MultiMedia2 Mixer"), Q6ROUTING_TX_DAPM_ROUTE("MultiMedia3 Mixer"), -- 2.53.0