From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.218.49 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794821916; b=P9/OKFzwbQD4hv2VN9zK7K9Q5buRwFxihcVKg+lgNN4F3yHmDq+BXabfbHOZG7vPsUQ3 Dn+olp2O9wathapgdLv31oS9g9obySwOOrOb9aqQzA7t5cnisSLjUARSDbuIhCgrt9ht+ qjGfOP+P6fYYsCJ8/bsv60DuYDOfwyU9dHfvS62ghyhK0yas2S9KZie8Wt93SQEqQiJcU CBDtzbFapeq3ZL5gUer3oNxzEB4lFSS5uZ5LmJ+0KBQo+HVr9mDKh1dtHyRv/mr59uIQW RXT2EaUeMGYOX8cdDqHvYnNMHtOoskB1gUd4XDsqXZlBddvJMaZxbI7mZcGnlakHOxA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794821916; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=GRtntifAekkHHJRH34pGQG6MUX974KOGHv0S1Vl70Sw=; b=iRS+7bw8wjL1Lpe8OM86ah/xyDw0W319kJyxNhYnzXHrxUKsWhIDDO/BF/xH7RK2dlPl Z3vf5nHvZCIOodPQIkJk9EMmipTRrPISjQxp6fpkUH7yrAHyzQRZ/kvNvW83f9QIM5YIw TcbLHgo+pyVWfa4q9LmiOUO15l1egBXUlRD2HsimZcA40F8h+aCfMZD/dLagITzDGfL0e OUyfIXVwXgHwQ7uG47IqS9+maSQEX0vNv64dNIUZCWwxBJeoDg5CsJEMtbHjvMWI8P6zh 8JXI54JTZxYQ8OIo7BiLgVLZiC7Vqlz4CoODXVhRvD9eNpKHv1RtQZhxhZxGuKbIfEA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=uyZFe+7b; arc=none smtp.remote-ip=209.85.218.49 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C7B2606A323 for ; Mon, 16 Nov 2026 09:38:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2C7B2606A323 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.a=rsa-sha256 header.s=20260707 header.b=uyZFe+7b Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-c4d30639709so449595466b.0 for ; Mon, 16 Nov 2026 01:38:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794821914; x=1795426714; 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:content-type; bh=GRtntifAekkHHJRH34pGQG6MUX974KOGHv0S1Vl70Sw=; b=uyZFe+7b0599MfdtHX6hsSzcVhPevJlZ6CCL8cr7bJgby3J5D+HWhhQjZnU5KQu0Z6 m+2lQGGzxQ48aJIFoNqmY/8jRoRKK8TyyJB0aam7QSz4aXIlkL3AbWPBLhkdDEM+nQEQ AmjuFfDtomFgc9NVUBEqD7nfj3N8j/UwxHzgfumYEKJuqLX/zMlyvGFnV1K1aMDETxh+ VdZuhoYoKPgP2Rr/cN9zwfv5ryEyNGQFYgem5gzEpX+oJNcONxeGukM7C0Owp8m7jM4U VOXHc5VpcDt5B8tEUDyXlUFIJt+eHtYIIvJooWZ7EHSoxX0EgF892B40kdgGzyBme/+u IAeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794821914; x=1795426714; 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:content-type; bh=GRtntifAekkHHJRH34pGQG6MUX974KOGHv0S1Vl70Sw=; b=NBeIsdK56Qm/Qe+mApL8b64TSqGp0/tvY44gjSzNROXpdtzD8gixfYSeu0H9A9vd1S Z/qRRwCf40Dt/weBGPc8AZ+7s+8jWe2wQ76eq7ykUUrqG4HPW8OCXo767cn2bDUBjanI Y86DKDYEwHkain5Np0T7gsVkkTSYIK7f8OrjxtoEJbskxdobWgbKOWqYrAxSiGszwyOT l96/eRfqiFmxXMS0ayikMKKzQlixc0BofeX59Mrcv4xeW3WQTTRbgKJq3KqlkuQZPs5d Hi8sw6zcmY5qplpt2utH3Ci7F2RvqOPQvuKSBSyMra7uqHdih/edWD/67wQREs0+aDcM aG9g== X-Gm-Message-State: APuU4Z8OpMNoBhj0n6N+EDHviMLLWbpea8DM6EzRl2GDGUUv0I1I0Edb yA1NX2j4NjJqxfd7XPDMz/bBUZGKWgxJpX6Uet2eAb9OFs0ow2UnZiLI X-Gm-Gg: AYBFou0Z3t/sgje6vd0w8fbjkrFRcFWWJlJiAnqHKbaVUuUaxsClliZb88ouupodwzE BT7iDh13d3t+ys7Ym8ngfLEqvOpLAAwL71OIjAvAw/6DjonYVkpgH928EYbZHd4xvzYQuCr71rG NG1TISV38nyWyVZSvO3VPxKUhr3ab+CtMbqcJjovlh2Lk4hHs6lGFiHxYJCEDALA+qU5drOB77J rbevjl5QTmC6rkSyuw8uFWQ3b7y8Z6P1jPk6aYPM5yCZ2ABfsHDPrnbyIdPv2jJtFicd9fXGS3/ INJl2ifCGw7QcrAWqjpeiHYhwMi0otuVjUm+P0CqYZfQY36HRHsuo/0LQ+1yVGIsffw43WW+4vy XQGAeBiWHuYGLwc4el5Ij4kHbrPUTymnZm/LKMnGllgKTl6Z0nbF/m3nre7KXBTfC+PTKLiOgwS 56b9UdHbn3ozOWLWsnXRj3VncjxRP0NjIFnxgph9W9jD0D0/lWsxBlAukz43RrsrQVIByk92yih oZFgWKTkPcr8UNRpAiGJu01BdrIGYm3wtJYDxGvnq0gwJgSQG+wcWNIwvH4DTJpqucMfSDJ8FJV p0qy8MUHIu5QtrgEBeRDUQ+NlADWrW+uTTj4qJ6t/4dtkYIm9eb3AlRi5U1hHlMQpCaoTVKHu2k swfjhjkKdKae3ivMYl3jzm6xclETlS1c= X-Received: by 2002:a17:907:6e87:b0:c40:4965:72cb with SMTP id a640c23a62f3a-c509640bef4mr657832666b.21.1794821914164; Mon, 16 Nov 2026 01:38:34 -0800 (PST) Received: from xeon ([188.163.112.62]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c5095b72868sm379906166b.65.2026.11.16.01.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 01:38:33 -0800 (PST) From: Svyatoslav Ryhel To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Thierry Reding , Jonathan Hunter , Svyatoslav Ryhel , =?UTF-8?q?Jonas=20Schw=C3=B6bel?= , Sasha Levin Cc: linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH v1 2/3] ASoC: tegra: Generalize forced DAPM pin enabling via tegra_asoc_data Date: Mon, 16 Nov 2026 11:38:00 +0200 Message-ID: <20261116093805.73715-3-clamor95@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261116093805.73715-1-clamor95@gmail.com> References: <20261116093805.73715-1-clamor95@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Introduce a dapm_fe_pin_name field in struct tegra_asoc_data to handle force-enabling DAPM pins (such as "MICBIAS" or "MICBIAS1") directly inside the common tegra_asoc_machine_init() function. This cleanup allows the removal of repetitive, boilerplate codec-specific initialization functions (tegra_rt5677_init(), tegra_wm8903_init(), and tegra_wm8962_init()) and points their DAI link init callbacks directly to tegra_asoc_machine_init(). Signed-off-by: Svyatoslav Ryhel --- sound/soc/tegra/tegra_asoc_machine.c | 62 ++++++---------------------- sound/soc/tegra/tegra_asoc_machine.h | 1 + 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c index 18302119a08d2..ebca41a5db752 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -154,6 +154,7 @@ static const struct snd_kcontrol_new tegra_wm8994_controls[] = { static int tegra_asoc_machine_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); struct tegra_machine *machine = snd_soc_card_get_drvdata(card); struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); struct snd_soc_component *component = codec_dai->component; @@ -252,6 +253,9 @@ static int tegra_asoc_machine_init(struct snd_soc_pcm_runtime *rtd) } } + if (machine->asoc->dapm_fe_pin_name) + snd_soc_dapm_force_enable_pin(dapm, machine->asoc->dapm_fe_pin_name); + return 0; } @@ -908,21 +912,6 @@ static const struct tegra_asoc_data tegra_trimslice_data = { /* RT5677 machine */ -static int tegra_rt5677_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_card *card = rtd->card; - struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); - int err; - - err = tegra_asoc_machine_init(rtd); - if (err) - return err; - - snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1"); - - return 0; -} - SND_SOC_DAILINK_DEFS(rt5677_aif1, DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5677-aif1")), @@ -931,7 +920,7 @@ SND_SOC_DAILINK_DEFS(rt5677_aif1, static struct snd_soc_dai_link tegra_rt5677_dai = { .name = "RT5677", .stream_name = "RT5677 PCM", - .init = tegra_rt5677_init, + .init = tegra_asoc_machine_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, @@ -948,6 +937,7 @@ static struct snd_soc_card snd_soc_tegra_rt5677 = { static const struct tegra_asoc_data tegra_rt5677_data = { .mclk_rate = tegra_machine_mclk_rate_256, .card = &snd_soc_tegra_rt5677, + .dapm_fe_pin_name = "MICBIAS1", .add_common_dapm_widgets = true, .add_common_controls = true, .add_common_snd_ops = true, @@ -998,7 +988,7 @@ SND_SOC_DAILINK_DEFS(rt5632_hifi, static struct snd_soc_dai_link tegra_rt5632_dai = { .name = "ALC5632", .stream_name = "ALC5632 PCM", - .init = tegra_rt5677_init, + .init = tegra_asoc_machine_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, @@ -1015,6 +1005,7 @@ static struct snd_soc_card snd_soc_tegra_rt5632 = { static const struct tegra_asoc_data tegra_rt5632_data = { .mclk_rate = tegra_machine_mclk_rate_512, .card = &snd_soc_tegra_rt5632, + .dapm_fe_pin_name = "MICBIAS1", .add_common_dapm_widgets = true, .add_common_controls = true, .add_common_snd_ops = true, @@ -1089,21 +1080,6 @@ static const struct tegra_asoc_data tegra_cpcap_data = { /* WM8903 machine */ -static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_card *card = rtd->card; - struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); - int err; - - err = tegra_asoc_machine_init(rtd); - if (err) - return err; - - snd_soc_dapm_force_enable_pin(dapm, "MICBIAS"); - - return 0; -} - SND_SOC_DAILINK_DEFS(hifi, DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8903-hifi")), @@ -1112,7 +1088,7 @@ SND_SOC_DAILINK_DEFS(hifi, static struct snd_soc_dai_link tegra_wm8903_dai = { .name = "WM8903", .stream_name = "WM8903 PCM", - .init = tegra_wm8903_init, + .init = tegra_asoc_machine_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, @@ -1132,6 +1108,7 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = { static const struct tegra_asoc_data tegra_wm8903_data_legacy = { .mclk_rate = tegra_machine_mclk_rate_6mhz, .card = &snd_soc_tegra_wm8903, + .dapm_fe_pin_name = "MICBIAS", .hp_jack_gpio_active_low = true, .add_common_dapm_widgets = true, .add_common_controls = true, @@ -1143,6 +1120,7 @@ static const struct tegra_asoc_data tegra_wm8903_data_legacy = { static const struct tegra_asoc_data tegra_wm8903_data = { .mclk_rate = tegra_machine_mclk_rate_6mhz, .card = &snd_soc_tegra_wm8903, + .dapm_fe_pin_name = "MICBIAS", .add_common_dapm_widgets = true, .add_common_controls = true, .add_common_snd_ops = true, @@ -1152,21 +1130,6 @@ static const struct tegra_asoc_data tegra_wm8903_data = { /* WM8962 machine */ -static int tegra_wm8962_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_card *card = rtd->card; - struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); - int err; - - err = tegra_asoc_machine_init(rtd); - if (err) - return err; - - snd_soc_dapm_force_enable_pin(dapm, "MICBIAS"); - - return 0; -} - SND_SOC_DAILINK_DEFS(wm8962_hifi, DAILINK_COMP_ARRAY(COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8962")), @@ -1175,7 +1138,7 @@ SND_SOC_DAILINK_DEFS(wm8962_hifi, static struct snd_soc_dai_link tegra_wm8962_dai = { .name = "WM8962", .stream_name = "WM8962 PCM", - .init = tegra_wm8962_init, + .init = tegra_asoc_machine_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC, @@ -1194,6 +1157,7 @@ static struct snd_soc_card snd_soc_tegra_wm8962 = { static const struct tegra_asoc_data tegra_wm8962_data = { .mclk_rate = tegra_machine_mclk_rate_12mhz, .card = &snd_soc_tegra_wm8962, + .dapm_fe_pin_name = "MICBIAS", .add_common_dapm_widgets = true, .add_common_controls = true, .add_common_snd_ops = true, diff --git a/sound/soc/tegra/tegra_asoc_machine.h b/sound/soc/tegra/tegra_asoc_machine.h index 2034ce8e0689e..8ff39b53930c5 100644 --- a/sound/soc/tegra/tegra_asoc_machine.h +++ b/sound/soc/tegra/tegra_asoc_machine.h @@ -13,6 +13,7 @@ struct snd_soc_pcm_runtime; struct tegra_asoc_data { unsigned int (*mclk_rate)(unsigned int srate); + const char *dapm_fe_pin_name; const char *codec_dev_name; const char *hp_jack_name; struct snd_soc_card *card; -- 2.53.0