From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (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 F02533DFC8B for ; Wed, 4 Mar 2026 19:59:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772654387; cv=none; b=f32vxAIn3gxC7Iusg8gFWNC1sgvXDZuz8X/zYRHX7oI7okg9oiYXX7qFTN8Q/SzM99GimhUziLPfDxU7JkMQKsGNoD2RyoQCgQ5kdKpjhCZxTq26v2whQ/Qa04fqhZTtdBcyjX5KNZMdldUSgtH13ZuCg+aRIF96BIeaKCkvxIk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772654387; c=relaxed/simple; bh=Tyv14tXiQQ3Dg+Zb3/s/SgQELz+RF1nXa/tzRxNgEm4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m6XwZR8FNZbSi9/j+xaNX7NDHc2pEgCX7+N37h/jBS7k178Av0r/pRqouoEDRCY3QHMdvovtd84kBnB3+Mt//tHj3NE2faeFBlGOIXplwLYTzlQR27BtAaKilbrORUX8YuHT34h4fW3w/Jsw9Fr3mNfG65ubqjXV/r4tCqyUenY= 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=jOLj+BQf; arc=none smtp.client-ip=209.85.160.172 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="jOLj+BQf" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-505e2e4c35fso71092601cf.3 for ; Wed, 04 Mar 2026 11:59:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772654385; x=1773259185; 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=gsFOYU+WlfKYO7leyIpUkZYt92HUjRGNDo36iVKhtVI=; b=jOLj+BQfv0GAQ82Q0j2cUqN54iCdR7lwn5+zZV/2gn88JKEpydVfjgJs97GweQSCIM 5kxywRWOcB6EFlsRKNNnEZzb/SGIUiQPnYA888cco7eObQKK1s4M1mw2k7UKeIaOxmWu pN9v6bvmFV1uS6q4eXsotffiXj97L/5Px4z6Is/Q/shyOhDRycGuVMFv/Cc7GLam0aIt tp1k4kegEslLHcZceeBbvWd4h53zCKAtG/E6ZzJZw9F17tMEGS4admtBQHhHsHbZsJtV fIvil7zWJdJauBRWxPlr5OopniMOAgXaSypaUchb0Mj+bG2pe2q4NoB0PM/MUc2YfIAu Od2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772654385; x=1773259185; 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=gsFOYU+WlfKYO7leyIpUkZYt92HUjRGNDo36iVKhtVI=; b=w6Wsf1kRL6LAWggwm49n4PLd+npV/tEYghJuRuLC/7EqnhpWeFVKh+sY4miIieJOYJ rDY2x8vntJQCAf7jwZGSybjtlr77sMpqliQDQfj7Q60CF/npyarA/e66PizPYKlLVinK H5BnCD1sC7xnwl7sXssjL90QkiIxS6+xOCgWPFTZ3KHmbp9xg3NbNA/RsDkdRIjTUjOV GT5jygkq3O8LPAhH6te7kaA3ugxp42YJ50pILLQ2jIvEag0EmtiJfw0ScMdWsqwtOlRJ ssqxfz2DoseFU3m46D8Qi1z43E0WJenW2UD1QHdmL/z5KDdzoXqs3yTCPoHByD4RPVRd jr7Q== X-Forwarded-Encrypted: i=1; AJvYcCXRasI5nWvOUQLkXkZpOAbf5jafW8vy6tmrGLJoFy5J3qrWxKeGcRoMYG+ohWmnn5z5lfc3vpujLfrYenm0@vger.kernel.org X-Gm-Message-State: AOJu0YxBG6dDaW2JjA8zbJW4hWppc9jVADcH1mJ4l8VB3QFwV6CzhLfr Tu0QLodu9wVolrGZCrBfPJh4w61uASueg0+WqfcvoYpL444ZOJwIgE1r X-Gm-Gg: ATEYQzzdw5+3ZWOWl/duLcjelfW3BTSm5+utsRMqlcEVw6/hVq8mJTJVkeLOhhGBy+u hRBVBgeK0naZ7RqP4PmvlH6Lj8QULhgNSdjNktGq83ZA3PbLkmSG32J0xcBRBfbAL2aqvxe0VLN Dfa439Pfy6B7I3siKxSunu1QRQqe5GdzPeyXy/iTrk5wRQ7RsPMI7BoD/4kPoBB/hB+altwNrj2 Wx2iadjbERqNN4ZywVjiSBCcRu6vZRObg0gTCn64+T6K1lbMpxbvBMe2v/DnzjLBQPvrjsMddJc G2G4A86kNGdA8szRmoP7jX+kxZOXp91SK5YdmmTo0wuuDIFIKEyIuBsyg9AOpUuYM6z8ykfQuKM r2bquxvzYtMVcqXAthQuPa830855XeOcyms7BvOiKPJ/z5add2Gd9Ogk8ZDDb9v7w86uZZImTik N+QDiPOMS9fHzZ2aebgAYhSlnBmg== X-Received: by 2002:ac8:5e46:0:b0:4f4:ee07:91b9 with SMTP id d75a77b69052e-508db38a788mr41793811cf.47.1772654384881; Wed, 04 Mar 2026 11:59:44 -0800 (PST) Received: from localhost ([184.144.58.243]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50744ad885bsm158916631cf.28.2026.03.04.11.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 11:59:44 -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 10/11] ASoC: qcom: add sdm660 sound card support Date: Wed, 4 Mar 2026 14:58:14 -0500 Message-ID: <20260304195815.52347-11-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: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The Snapdragon 670 and Snapdragon 660 share the sound card, which can have digital/analog WCD, WCD9335, WCD934X, or board-specific sound codecs. Add support for the sound card. Signed-off-by: Richard Acayan --- sound/soc/qcom/Kconfig | 12 +++ sound/soc/qcom/Makefile | 2 + sound/soc/qcom/sdm660.c | 192 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 206 insertions(+) create mode 100644 sound/soc/qcom/sdm660.c diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index e6e24f3b9922..2ef4c436e534 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -167,6 +167,18 @@ config SND_SOC_MSM8996 APQ8096 SoC-based systems. Say Y if you want to use audio device on this SoCs +config SND_SOC_SDM660 + tristate "SoC Machine driver for SDM660 and SDM670 boards" + depends on QCOM_APR + depends on OF + depends on PM + select SND_SOC_QDSP6 + select SND_SOC_QCOM_COMMON + help + This adds support for audio on Qualcomm Technologies Inc. + SDM660 and SDM670 SoC-based systems. + Say Y if you want to use audio devices on these SoCs. + config SND_SOC_SDM845 tristate "SoC Machine driver for SDM845 boards" depends on QCOM_APR && I2C && SOUNDWIRE diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile index 985ce2ae286b..8b6bdc19e780 100644 --- a/sound/soc/qcom/Makefile +++ b/sound/soc/qcom/Makefile @@ -24,6 +24,7 @@ snd-soc-apq8016-sbc-y := apq8016_sbc.o snd-soc-apq8096-y := apq8096.o snd-soc-sc7180-y := sc7180.o snd-soc-sc7280-y := sc7280.o +snd-soc-sdm660-y := sdm660.o snd-soc-sdm845-y := sdm845.o snd-soc-sm8250-y := sm8250.o snd-soc-sc8280xp-y := sc8280xp.o @@ -38,6 +39,7 @@ obj-$(CONFIG_SND_SOC_MSM8996) += snd-soc-apq8096.o obj-$(CONFIG_SND_SOC_SC7180) += snd-soc-sc7180.o obj-$(CONFIG_SND_SOC_SC7280) += snd-soc-sc7280.o obj-$(CONFIG_SND_SOC_SC8280XP) += snd-soc-sc8280xp.o +obj-$(CONFIG_SND_SOC_SDM660) += snd-soc-sdm660.o obj-$(CONFIG_SND_SOC_SDM845) += snd-soc-sdm845.o obj-$(CONFIG_SND_SOC_SM8250) += snd-soc-sm8250.o obj-$(CONFIG_SND_SOC_QCOM_COMMON) += snd-soc-qcom-common.o diff --git a/sound/soc/qcom/sdm660.c b/sound/soc/qcom/sdm660.c new file mode 100644 index 000000000000..8dae01b733dd --- /dev/null +++ b/sound/soc/qcom/sdm660.c @@ -0,0 +1,192 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2023, Richard Acayan. All rights reserved. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "common.h" +#include "qdsp6/q6afe.h" + +#define DEFAULT_SAMPLE_RATE_48K 48000 +#define DEFAULT_INT_MCLK_RATE 9600000 +#define MI2S_BCLK_RATE 1536000 + +struct sdm660_snd_data { + struct snd_soc_jack jack; + bool jack_setup; + uint32_t int0_mi2s_clk_count; + uint32_t int3_mi2s_clk_count; +}; + +static int snd_sdm660_startup(struct snd_pcm_substream *stream) +{ + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(stream); + struct sdm660_snd_data *data = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_dai *cpu = snd_soc_rtd_to_cpu(rtd, 0); + + switch (cpu->id) { + case INT0_MI2S_RX: + data->int0_mi2s_clk_count++; + if (data->int0_mi2s_clk_count == 1) + snd_soc_dai_set_sysclk(cpu, + Q6AFE_LPASS_CLK_ID_INT0_MI2S_IBIT, + MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); + + snd_soc_dai_set_fmt(cpu, SND_SOC_DAIFMT_CBP_CFP); + + break; + case INT3_MI2S_TX: + data->int3_mi2s_clk_count++; + if (data->int3_mi2s_clk_count == 1) + snd_soc_dai_set_sysclk(cpu, + Q6AFE_LPASS_CLK_ID_INT3_MI2S_IBIT, + MI2S_BCLK_RATE, SNDRV_PCM_STREAM_PLAYBACK); + + snd_soc_dai_set_fmt(cpu, SND_SOC_DAIFMT_CBP_CFP); + + break; + default: + dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__, + cpu->id); + return -EINVAL; + } + + return 0; +} + +static void snd_sdm660_shutdown(struct snd_pcm_substream *stream) +{ + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(stream); + struct sdm660_snd_data *data = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_dai *cpu = snd_soc_rtd_to_cpu(rtd, 0); + + switch (cpu->id) { + case INT0_MI2S_RX: + data->int0_mi2s_clk_count--; + if (data->int0_mi2s_clk_count == 0) + snd_soc_dai_set_sysclk(cpu, + Q6AFE_LPASS_CLK_ID_INT0_MI2S_IBIT, + 0, SNDRV_PCM_STREAM_PLAYBACK); + + break; + case INT3_MI2S_TX: + data->int3_mi2s_clk_count--; + if (data->int3_mi2s_clk_count == 0) + snd_soc_dai_set_sysclk(cpu, + Q6AFE_LPASS_CLK_ID_INT3_MI2S_IBIT, + 0, SNDRV_PCM_STREAM_PLAYBACK); + + break; + default: + dev_err(rtd->dev, "%s: invalid dai id 0x%x\n", __func__, + cpu->id); + break; + } +} + +static const struct snd_soc_ops sdm660_ops = { + .startup = snd_sdm660_startup, + .shutdown = snd_sdm660_shutdown, +}; + +static int sdm660_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); + + rate->min = rate->max = DEFAULT_SAMPLE_RATE_48K; + snd_mask_set_format(fmt, SNDRV_PCM_FORMAT_S16_LE); + + channels->min = channels->max = 2; + + return 0; +} + +static int sdm660_dai_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_card *card = rtd->card; + struct sdm660_snd_data *data = snd_soc_card_get_drvdata(card); + + return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup); +} + +static void snd_sdm660_add_ops(struct snd_soc_card *card) +{ + struct snd_soc_dai_link *link; + int i; + + for_each_card_prelinks(card, i, link) { + if (link->no_pcm == 1) { + link->ops = &sdm660_ops; + link->be_hw_params_fixup = sdm660_be_hw_params_fixup; + } + + link->init = sdm660_dai_init; + } +} + +static int snd_sdm660_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card; + struct sdm660_snd_data *data; + struct device *dev = &pdev->dev; + int ret; + + card = devm_kzalloc(dev, sizeof(struct snd_soc_card), GFP_KERNEL); + if (!card) + return -ENOMEM; + + data = devm_kzalloc(dev, sizeof(struct sdm660_snd_data), GFP_KERNEL); + if (!card) + return -ENOMEM; + + card->driver_name = "sdm660"; + card->dev = dev; + card->owner = THIS_MODULE; + + ret = qcom_snd_parse_of(card); + if (ret) + return ret; + + snd_soc_card_set_drvdata(card, data); + + snd_sdm660_add_ops(card); + + return devm_snd_soc_register_card(dev, card); +} + +static const struct of_device_id snd_sdm660_device_id[] = { + { .compatible = "qcom,sdm660-sndcard", }, + { } +}; +MODULE_DEVICE_TABLE(of, snd_sdm660_device_id); + +static struct platform_driver snd_sdm660_driver = { + .probe = snd_sdm660_probe, + .driver = { + .name = "sdm660-sndcard", + .of_match_table = snd_sdm660_device_id, + .pm = &snd_soc_pm_ops, + }, +}; +module_platform_driver(snd_sdm660_driver); + +MODULE_DESCRIPTION("sdm660 ASoC Machine Driver"); +MODULE_LICENSE("GPL"); -- 2.53.0