From nobody Wed Feb 11 02:33:14 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 9CB7C5028B for ; Mon, 22 Apr 2024 13:44:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713793444; cv=none; b=QDquoM9mf4y4q49GkeOQIavNLeg3SAF4tSlBAmDxYirYDqx2NR+nQACLkb88cldinuh3+INNnl/EDcPGrepUbylVG5aOnV3z3ZjNvcUj7XD+1iojwIwwCbzl5ol8al8/BzL/j5fVfrMwtc3f4YWple+RVIdc5O+OKtvKbHzdOvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713793444; c=relaxed/simple; bh=rPldZ9H/ghc6AHkcMuyq2S8TeCvPuuLZe494dCfPxzU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kSMlVFcc8ieNoaDAUoEVPQSDhswKIMdBycyJCvY+8r2gTFwWOLv+qayam9SxgRokhjbessaCcx2F/VWtVxWzDcItyFSPDBDbFEQvGdO3kjXiUr3GCIAJyCw3o2Muyl+yi6yN6cY27oAKG5GeePyqDxv9yOM47bcuRzA4J2A9rtc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=PQpsTJA3; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="PQpsTJA3" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-41a5b68ed5cso9409785e9.2 for ; Mon, 22 Apr 2024 06:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713793441; x=1714398241; 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=C68a3MzfkPxx0ofANoAgzKhNox/WCcxWh7hhMFfdoBw=; b=PQpsTJA3yBZYkh64TrBA3t4lqyw3BwuJ0G6Rewxwp27G1VSXsOd8gc69ZKm0WratS8 Z/TMMi6k7EtTL8PC6QvkuwzwromLINSAVHIwhydhHZiuQVafnnzPYCnhvrJ06gnqEN4w NyJSPkU/IbKh/Ck/zk2NtytZJWNoqJfpoleYxcL1WxeCy6a88aSiQC1c8THOcqXBUcRv rLfpNPYaM1j2Lq1C0YdSadwtHWzkfw+SSydoZtmX80rQ/e+UriE5C1SawIu8Z2t3wJmu FTK/wmlL8IBcPzvNDs1YC3QsBqOi2YqSqlRQ6+Jed/c+T8maGlmMF8iIceXqvKBULHvF ubNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713793441; x=1714398241; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C68a3MzfkPxx0ofANoAgzKhNox/WCcxWh7hhMFfdoBw=; b=G2DD4rw9Z0qE+IXUOareUSrsHcYpK6TeQ8xQfT1t17xQXAXMs3XdvXKV0BSm4iDJdb qMysrvohPyJhtmxCkzHUtik9ebyJ4eHaLLSdE57YCOGSGa2jZH5ZcRGDouddizoBhZ/R 2XQzwqBceSEqioJxlplwxgd2v4LsEdCF6M/aZe0zK69z5DPgylt+bauPgJPWJW+mzGTL /BoUcmMu1Jkudw0580E0BHsjQVaAzxY8y48y1EoOQOzfaochyu2274HPTW9R6LjvLcJu 1/PmBU44tN5niSlAuWH87JnVqBIu5oXF4GzdVV3uMp/faZPIO6hTieSZOL1fBlsoBHtI OwBw== X-Forwarded-Encrypted: i=1; AJvYcCX2bgDGbx4orcI3bCtuM+b6uKtqJxEQF7iZjN9vznpv7H2Ivea1VWTYuaZU2wC2PhZyJw9MWWiKARMzwATQpLKUSEchYzHk0QIC4yzV X-Gm-Message-State: AOJu0YycAOFoK5afl4BRkKjj0C56cHqar/aNj/WYw/6GiyjIpNhyF5ii Rt2mZdTFEymx8tk73jPAr7UUKtrq/O06A5ZVnGfXJngl+EvGcw3P9FHq6F0NRW8= X-Google-Smtp-Source: AGHT+IF69zomYFFe3gyx0JQZWSWnA/EuT1tmDcqnUqTrWCK1PAfUVruv7UpMnVLeTSrBE1kQSTUlSg== X-Received: by 2002:a05:600c:3b1a:b0:418:a706:3209 with SMTP id m26-20020a05600c3b1a00b00418a7063209mr8005525wms.31.1713793441064; Mon, 22 Apr 2024 06:44:01 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b00417d624cffbsm20731069wmq.6.2024.04.22.06.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 06:44:00 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2 1/4] ASoC: qcom: q6dsp: parse Display port tokens Date: Mon, 22 Apr 2024 14:43:51 +0100 Message-Id: <20240422134354.89291-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240422134354.89291-1-srinivas.kandagatla@linaro.org> References: <20240422134354.89291-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla DP Module needs to know the data format type which is specified in the tplg file, parse that info before setting up the module. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/topology.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topolog= y.c index 70572c83e101..27a5adb201c3 100644 --- a/sound/soc/qcom/qdsp6/topology.c +++ b/sound/soc/qcom/qdsp6/topology.c @@ -730,6 +730,29 @@ static int audioreach_widget_i2s_module_load(struct au= dioreach_module *mod, return 0; } =20 +static int audioreach_widget_dp_module_load(struct audioreach_module *mod, + struct snd_soc_tplg_vendor_array *mod_array) +{ + struct snd_soc_tplg_vendor_value_elem *mod_elem; + int tkn_count =3D 0; + + mod_elem =3D mod_array->value; + + while (tkn_count <=3D (le32_to_cpu(mod_array->num_elems) - 1)) { + switch (le32_to_cpu(mod_elem->token)) { + case AR_TKN_U32_MODULE_FMT_DATA: + mod->data_format =3D le32_to_cpu(mod_elem->value); + break; + default: + break; + } + tkn_count++; + mod_elem++; + } + + return 0; +} + static int audioreach_widget_load_buffer(struct snd_soc_component *compone= nt, int index, struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) @@ -760,6 +783,9 @@ static int audioreach_widget_load_buffer(struct snd_soc= _component *component, case MODULE_ID_I2S_SOURCE: audioreach_widget_i2s_module_load(mod, mod_array); break; + case MODULE_ID_DISPLAY_PORT_SINK: + audioreach_widget_dp_module_load(mod, mod_array); + break; default: return -EINVAL; } --=20 2.25.1 From nobody Wed Feb 11 02:33:14 2026 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 DDB9E150981 for ; Mon, 22 Apr 2024 13:44:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713793445; cv=none; b=MIWQUtLo5WR5BBnavpw3OkoJzYRU7sqzop8HNPimzcecUR6LLiUU7MN8WY9rJbf44UbmwXU0mWc3tGdAuClhFEViWdJ7Trp5wk/ebj8u5+CnwN1DUOPxR6w3S9pzBgNINsikTGcLbQxHx91svbg2Vct2L1py7A0EnJtzR1avnG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713793445; c=relaxed/simple; bh=QPGkywHhxJwbRVmkKg4yvrDXLaFojPp13JVOp7ayaxM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OQ6RkoDdP59HXpQTzf9VYFf5Xh2QVe/eXfWPMRsNFynzJs4aoRRvC6F2xcRaqEKZlHj6dV7k7z4V6i1WiAWpind5sBi0j0QnWMPNc/G67lLb9Vcjmku6ayxmEQkePgRI9yWRzDa4demQAxXuevVZkl8JDAoi7ic+eRd/xzYKbr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Au0Qv3by; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Au0Qv3by" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3465921600dso3960418f8f.3 for ; Mon, 22 Apr 2024 06:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713793442; x=1714398242; 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=4DCZ+LurAPUpbkstxc4dh5F2TeDg5m/lAZJCQ3k7AMU=; b=Au0Qv3byobwaaub26oFA22SLu1mNmnRAIhpclfeKZDMCuHpSu0dUqgwZklL7A6UjWL 7AULhuWnB7G2H82jDUIvxfy0gGYQwJZSiV1fzG/onONiCydn1ZLod5QnJ+JxmzUAmSz7 YNio+FttIDmhhVqPBa5Tdi9J0xbKk700DvfSexPpJu4BYGxIS8bO3Nh+M3M2j86Fa6ag A0/VsVkC4H1Fu3zSp/0VQTAPvfWfg/5tDtAN56nB8N1Tff2SZgXttSOpMSId168NW9oI yfqXe6fPPPOxYuyw6Ua6hYVD7j15DD47SYCfC7tK0Kz7Q+5xkfRVmV6SZMI7GvT/mrZG cfsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713793442; x=1714398242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4DCZ+LurAPUpbkstxc4dh5F2TeDg5m/lAZJCQ3k7AMU=; b=jP+ZlEROdoFZJ0s4hPMn3a7h0nBUilXOxZuJJ2UgVkcd3Gdyin8IIVmx37ByCN0gXA oZB9+g36OfiPolXT7+PgRZipbpBXiA9Gm8AM9LGG4LZR8BYUbaIjRPM0JZ4gyScFrgPt DthDZ4bml4dSAnx9A2b+Z8y/ZqQYScEITr+lUxnh26AV+WlfQ8/43xm3xO/utcfQOupW XCHl3LdeDSGGSID7vnvX9iU6Is0sHE9mOs6QYy9358c0gASExl7HdU/CgaZjad0VMK5b 7IaBEM0mtxE3Vyd++8cr9u7iokvTnvlwwCpRYHy8fEhyqBca6TT67y7lcdFYiLD7jPsh Rhow== X-Forwarded-Encrypted: i=1; AJvYcCXDWhPlYvl40QEfCABw/VEomf88J0LCYDcVy6H61+DnH4TulkKCT+egxlqjYQ7i5e77NIl8W6bOWKRvrP9y3lTdoaob7sbJzsYMmaD+ X-Gm-Message-State: AOJu0YzrrviijmeCjyBMk69/5YknK6SQUCHESvEuPbNPQJlD1iqjQZOf wP8dSscDD4YCQiLX2XiERM9NRDHfowHzGYd2/q9jOcoGJfytAk/3fp3HzsQVuzo= X-Google-Smtp-Source: AGHT+IEq1VrIPR3upvHPe1XfDjkR/T391HRzjxsXogocBrP/QBTphSY+BSVPlcXSaBcwT4MucQNb0w== X-Received: by 2002:a5d:6a07:0:b0:343:77f4:e663 with SMTP id m7-20020a5d6a07000000b0034377f4e663mr6457055wru.18.1713793442317; Mon, 22 Apr 2024 06:44:02 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b00417d624cffbsm20731069wmq.6.2024.04.22.06.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 06:44:01 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2 2/4] ASoC: qcom: common: add Display port Jack function Date: Mon, 22 Apr 2024 14:43:52 +0100 Message-Id: <20240422134354.89291-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240422134354.89291-1-srinivas.kandagatla@linaro.org> References: <20240422134354.89291-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla Add a common function to add Display port jack, this can be used by multiple board files and avoid any code duplication. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/common.c | 29 +++++++++++++++++++++++++++++ sound/soc/qcom/common.h | 3 +++ 2 files changed, 32 insertions(+) diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c index 747041fa7866..3bfe618e7bd7 100644 --- a/sound/soc/qcom/common.c +++ b/sound/soc/qcom/common.c @@ -7,10 +7,14 @@ #include #include #include "common.h" +#define NAME_SIZE 32 =20 static const struct snd_soc_dapm_widget qcom_jack_snd_widgets[] =3D { SND_SOC_DAPM_HP("Headphone Jack", NULL), SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_SPK("HDMI/DP0 Jack", NULL), + SND_SOC_DAPM_SPK("HDMI/DP1 Jack", NULL), + SND_SOC_DAPM_SPK("HDMI/DP2 Jack", NULL), }; =20 int qcom_snd_parse_of(struct snd_soc_card *card) @@ -239,4 +243,29 @@ int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime= *rtd, return 0; } EXPORT_SYMBOL_GPL(qcom_snd_wcd_jack_setup); + +int qcom_snd_dp_jack_setup(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_jack *hdmi_jack, int hdmi_pcm_id) +{ + struct snd_soc_dai *codec_dai =3D snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_card *card =3D rtd->card; + char jack_name[NAME_SIZE]; + int rval, i; + + snprintf(jack_name, sizeof(jack_name), "HDMI/DP%d Jack", hdmi_pcm_id); + rval =3D snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, hdmi_jack= ); + if (rval) + return rval; + + for_each_rtd_codec_dais(rtd, i, codec_dai) { + rval =3D snd_soc_component_set_jack(codec_dai->component, hdmi_jack, NUL= L); + if (rval !=3D 0 && rval !=3D -ENOTSUPP) { + dev_warn(card->dev, "Failed to set jack: %d\n", rval); + return rval; + } + } + + return 0; +} +EXPORT_SYMBOL_GPL(qcom_snd_dp_jack_setup); MODULE_LICENSE("GPL"); diff --git a/sound/soc/qcom/common.h b/sound/soc/qcom/common.h index d7f80ee5ae26..3675d72c5285 100644 --- a/sound/soc/qcom/common.h +++ b/sound/soc/qcom/common.h @@ -9,5 +9,8 @@ int qcom_snd_parse_of(struct snd_soc_card *card); int qcom_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack, bool *jack_setup); +int qcom_snd_dp_jack_setup(struct snd_soc_pcm_runtime *rtd, + struct snd_soc_jack *jack, int id); + =20 #endif --=20 2.25.1 From nobody Wed Feb 11 02:33:14 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 5C7101509A3 for ; Mon, 22 Apr 2024 13:44:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713793447; cv=none; b=i+1DgR1nqWi2X32MsQDHFfHUKFqH9Th2WwDGS+ld4QDtR02pH8pHvgfCmVEAygf1nMh5djL39FBauVi8Ig6ilekuGFf9oEd15/7IpKHiIu8DHiPg54VtraiDc2uC87eLOFBL4WaRq5GX8YHRM2yJywLf8WsP2Ybfn+TVWQ9gSnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713793447; c=relaxed/simple; bh=RSqYj9fLODqyWDFm63AWBPUaIjp1sUJoSIUJRQbfYkY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p409LLOliKJZbGtt0lhQjNtoZ2bVKD1OUkYbFqZD2ASWRkBfU3t+GggbNoFx0guKm6fSrE3Q2UDt3fQS7vbtwYk2f2mhl/HDFtLwuW1FogKOLCicXkHhNaXOmEBktl7gJijC8nDKn6vbrt8mI4YdhWtOOjZThVdPlfu/GvnnHkw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=CG/uFNBI; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CG/uFNBI" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-41a7ae25d53so4709265e9.1 for ; Mon, 22 Apr 2024 06:44:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713793444; x=1714398244; 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=5ooDB6P5Kmg8yEzYGOGc1KNPluwmb/df6YvlokaERTg=; b=CG/uFNBIV+oCyYzHsctOIXuXw5rKjIBn2qpK5FYUhWfhKpqCe6x1cIkBvkjch9RXcv 0zpIr1jwe7tDzY7e48H6eOOXCFjvFgx2vyMa/x8DYlQ2ZLPrn8ja8DSiHjcf+9bjwr7i QxUCOGHyw4K/uvNeZF7kQxn97GcYMOOdp5m1yy+TkQtRTQzD0tRITRQl9zfPaEaMFxz0 U8Zs0biViHD++fZQ9uqzMwcPfkjpZqaM8gi+BA8GXZ+fa1EKXWJ+jn9T68Gk8hjEd1P4 qakrXOXLn7DGkMZASq/F5/9bnRTOvTFnh5SD9AEnCV8wqgET4OHt3Q4JnC/bbETs9CvI EuAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713793444; x=1714398244; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5ooDB6P5Kmg8yEzYGOGc1KNPluwmb/df6YvlokaERTg=; b=YbuIpKM8pESJtZHsLKT+jC0h7mGWAjoUHLPHEPCwpReqXK11cKLV3X8LlfXCWc5mEq xBE5l2/ODKH9QlIXi3bbcWn+/ixPXb/fYWvOhpHjUOp2s9VsbZD2utPvlV4CmWLzGT2v n+erzAhkXHbILsD3gmHvxl5WeJgCv+pFj6CaIA1lPCcP+A0dfbO7IDoKq+KHjK7VGyf8 d0zUNwZxHWQ2eeBxJoefYXbAldGbzk3LehCsjZs+kumXrFWYZY4BAKfKW394q/khataw D5/2/8XiEC1Fd88bgmaeGhd1pVMaKsw2DBxUg17AuNoTOXp6EBRA3YBKwDXAOSuZjFou 5szg== X-Forwarded-Encrypted: i=1; AJvYcCXHomxebHY+Ur9hkOLE6upTSh1vNPopsBvtXkYyK6vrwZA3QuB22NzB0O0l6UBDzRAKTKXJHyDr/aGHfUzxid4Yhi1zvG+kQcNqpMiF X-Gm-Message-State: AOJu0YwuW2X0t6q1ewNhm3+Z5+vyhB2sDKpD30NpkwW0CzBTpE5Rl29W GFDfqzPB62nMhpXnC70TYcFSpcOwiStiiwI6pB/XXPaEWo4CIBNbTWuPqzbIlsI= X-Google-Smtp-Source: AGHT+IHnK3xm7CMZ4D7teNrVAR475tu+8odtu8N0waL9N53OtCwv49PY4AtgG8UEQNcltk7ayCBSBg== X-Received: by 2002:a05:600c:46cb:b0:418:a786:3760 with SMTP id q11-20020a05600c46cb00b00418a7863760mr6722875wmo.15.1713793443690; Mon, 22 Apr 2024 06:44:03 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b00417d624cffbsm20731069wmq.6.2024.04.22.06.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 06:44:02 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2 3/4] ASoC: qcom: sc8280xp: add Display port Jack Date: Mon, 22 Apr 2024 14:43:53 +0100 Message-Id: <20240422134354.89291-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240422134354.89291-1-srinivas.kandagatla@linaro.org> References: <20240422134354.89291-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla Add support to Display Port Jack events, by making use of common helper function. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/sc8280xp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c index 878bd50ad4a7..38f97f19add9 100644 --- a/sound/soc/qcom/sc8280xp.c +++ b/sound/soc/qcom/sc8280xp.c @@ -19,6 +19,7 @@ struct sc8280xp_snd_data { struct snd_soc_card *card; struct sdw_stream_runtime *sruntime[AFE_PORT_MAX]; struct snd_soc_jack jack; + struct snd_soc_jack hdmi_jack[8]; bool jack_setup; }; =20 @@ -27,6 +28,8 @@ static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *= rtd) struct sc8280xp_snd_data *data =3D snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *cpu_dai =3D snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_card *card =3D rtd->card; + struct snd_soc_jack *hdmi_jack =3D NULL; + int hdmi_pcm_id =3D 0; =20 switch (cpu_dai->id) { case WSA_CODEC_DMA_RX_0: @@ -41,10 +44,21 @@ static int sc8280xp_snd_init(struct snd_soc_pcm_runtime= *rtd) snd_soc_limit_volume(card, "SpkrLeft PA Volume", 17); snd_soc_limit_volume(card, "SpkrRight PA Volume", 17); break; + case DISPLAY_PORT_RX_0: + hdmi_pcm_id =3D 0; + hdmi_jack =3D &data->hdmi_jack[hdmi_pcm_id]; + break; + case DISPLAY_PORT_RX_1 ... DISPLAY_PORT_RX_7: + hdmi_pcm_id =3D cpu_dai->id - DISPLAY_PORT_RX_1 + 1; + hdmi_jack =3D &data->hdmi_jack[hdmi_pcm_id]; + break; default: break; } =20 + if (hdmi_jack) + return qcom_snd_dp_jack_setup(rtd, hdmi_jack, hdmi_pcm_id); + return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup); } =20 --=20 2.25.1 From nobody Wed Feb 11 02:33:14 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 AAE711514C0 for ; Mon, 22 Apr 2024 13:44:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713793448; cv=none; b=D92aKBEhuM0+KZ1/uiQHSMpVhtJZ/sVp+inkTTZbsw09K6xkJmxGRGe4InSgXS7S3JKsg9V0OU5TERhF1UlaVyGHt+njUnDkX1fGYRAuGkdNfnHEU7NolP3vjx6gpX3c2eKOud7SJQHKQRUtJSr0H4O4DT6bA6XZUlEjZmp8+ts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713793448; c=relaxed/simple; bh=bLGXgpxnbSKLkCQguZ5XOqrsE1dxN3y9EhIB6LMNF4g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B007MhQQYph3YfQc047fTcLs3ujjAmL2xpsfMVycJbBgf5uHg4mpQSY+ZjKvlNgDKASuoPbTT4jlMzqik97ix5RERZpOtb5GWrXiiHYVnncGd3HLGaKXN/6QxRw+grvlq/Nv51lu2q2Ic5Egb0PCuzMCmXI8DQk0TGT3s6HhOOM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=EbkRXTtu; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EbkRXTtu" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-419fc79e4dcso10423275e9.1 for ; Mon, 22 Apr 2024 06:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713793445; x=1714398245; 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=7kwADMk5cdAVshWhjo8kiL5c8AnuAMycon0bxlwOriw=; b=EbkRXTtuBFcB5ir4wLkOKCiA1onqCV/vpsABL8+jW5BD0E3EKpN6OkM36CD50hmhTo H83ZYbWKwdhFTM/v+9RTFi9+FmK7M2mOjrx1ZN1IKU7EUioGV8uwbptDSzumgPTi4WDn Si7GFQ0ieuT4yJu7TEiK6O8T6SAJt3MSe6TxNAT2ov0+PNpnKnMaOhLlglM4xJ2R0TH9 34hGHtd1tB/+s0jx2dmTSkTeb527R4P+zQYVWjn42PVZOhbgbqBQJ9hhnB2i3SphZXzs tTs7VcLWTZrSN1v4BipsDsbRdZC46GfaRvmyUU1x8IukbzNaRxgECOj5GdhsfTicvjad lxNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713793445; x=1714398245; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7kwADMk5cdAVshWhjo8kiL5c8AnuAMycon0bxlwOriw=; b=RjrHkpU1Q98+5JhLxPN4AdAkP6QNFVu5Aroyy6/+70roZYX871kXJFJ0YzVEclYeUw bYgKcyf0HB2sl6jFWwVh8qS1+U8CQAzRDDx3QAkXPI/wEXTAZMCHRpK5lNr/asa9chN3 X1CuY96eXQwsfccFjFklhq8+ZxveI4i4Nlmlpp/rYwqjAC4kHrnr+HzQE6hl/GOlOlww Jj+HAA7UbZzO8RsTAC/EKRxQrwy8441hj3UXYX+mkBh6MOwR8+smnhksumAjxYqH58XC v4UkxCVo5STgM1NvZXDuWoesB0GLvbB/c4niLyflL8l7XGpNlAtHCBTX5gSCbtDlfawE GNww== X-Forwarded-Encrypted: i=1; AJvYcCU2vxEmyUsHXNuiyRjHV3z8bIQWnGjwCiM8Kng/xw6EQwGDGO3CsimW3+4gDlhu0yKt1gb88nwDPDk+s9GU/4uRpeys2dcCX818FevG X-Gm-Message-State: AOJu0YyMGN20a+CwNbcpHdStUbPi96+XgILkADZTs0ruq5Lxiz8S30nF VrQZLyqADth1deewcha48apAodDVLtQFmwu2pCVcRxmFnDPjc8DwqwF5Jr+3Rm8v8YbG0qBNsh5 Y X-Google-Smtp-Source: AGHT+IG4kwKfyMpRuWXlxFeKbxQWHJY+DwiUbTneZBOl7/zDE6gyAXrGAyk7QNgJ9pYfFQ1pPWWLuA== X-Received: by 2002:a05:600c:4688:b0:418:a2ce:77ae with SMTP id p8-20020a05600c468800b00418a2ce77aemr7466632wmo.27.1713793445132; Mon, 22 Apr 2024 06:44:05 -0700 (PDT) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id g18-20020a05600c4ed200b00417d624cffbsm20731069wmq.6.2024.04.22.06.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 06:44:04 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, lgirdwood@gmail.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v2 4/4] ASoC: qcom: sm8250: fix a typo in function name Date: Mon, 22 Apr 2024 14:43:54 +0100 Message-Id: <20240422134354.89291-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240422134354.89291-1-srinivas.kandagatla@linaro.org> References: <20240422134354.89291-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Srinivas Kandagatla Fix a small type in the function name as its confusing to see a SoC name that does not exist. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/sm8250.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c index d70df72c0160..9bd159b81d69 100644 --- a/sound/soc/qcom/sm8250.c +++ b/sound/soc/qcom/sm8250.c @@ -70,7 +70,7 @@ static int sm8250_snd_startup(struct snd_pcm_substream *s= ubstream) return qcom_snd_sdw_startup(substream); } =20 -static void sm2450_snd_shutdown(struct snd_pcm_substream *substream) +static void sm8250_snd_shutdown(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd =3D substream->private_data; struct snd_soc_dai *cpu_dai =3D snd_soc_rtd_to_cpu(rtd, 0); @@ -115,7 +115,7 @@ static int sm8250_snd_hw_free(struct snd_pcm_substream = *substream) =20 static const struct snd_soc_ops sm8250_be_ops =3D { .startup =3D sm8250_snd_startup, - .shutdown =3D sm2450_snd_shutdown, + .shutdown =3D sm8250_snd_shutdown, .hw_params =3D sm8250_snd_hw_params, .hw_free =3D sm8250_snd_hw_free, .prepare =3D sm8250_snd_prepare, --=20 2.25.1