From patchwork Mon Apr 7 12:41:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040418 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9BCC24CEEA for ; Mon, 7 Apr 2025 12:40:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029645; cv=none; b=WmhTJYmT71/Vk7D+UR1T6xMOaUBvX3rZoZLa2b1T7ACk8ydr3GgjgmF/qshw1jukWmQwkMP9s7C/EFow7Dubs8C8iLlOalwivXR/1vQtMLqrWwo/oltID6zbzZXdSAa6U4LMpSWfvFBzZ7zSm3DiR3ieCWy7GdoYICSyyQag0R8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029645; c=relaxed/simple; bh=WmimfHXe7d659dH469zboqlHgIrj7BnACGd8fTZSfTg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=E+HKPY2+5vf4zpax3BrYBOhoPPwXhHhXAjgwIyw4AcuSFfhVAxqYzNN3EEttIfFlio3LOtKoaCu0Emz2jb0mIiDZ0ezbxZrXdVUQhj/pB1MCwLiy7WQGmYROjB5iWfZnKuaH8yjl0Y6ZnWk6QZ5QCNOtA865Kmb0cPExmHAXmIw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=PDW3FRva; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="PDW3FRva" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029644; x=1775565644; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WmimfHXe7d659dH469zboqlHgIrj7BnACGd8fTZSfTg=; b=PDW3FRvaXTpt7PXrJl5kclIpg+h8gjoRHN/v4fU4biUubIa+nlZmjBGm +x0vtFgxYI52+x5T966rqYCNhCsSZEcK1UokQhb8P2A3V8DgE4hMJA/Rh CoFQwIpDnZ3dCDzr83m4+WSBCqjC8KGWQNip4FUdsL5pX5IkmM1boAOPU zcBw8rQgUqUk9q/rFfwQbWUR3NKuWbmnIIHqYEwDxBOqRYgN8SSBRGX+k SjjuCHwr24R+56xERMa2QncVpsMeNXyvGgDSRYa4gUwgsdoYQ6wczWuyp lIoPd0i2e8yxt6oT8EybKLO+UtWibJJ41ePnG7dv4aZGLvvg1b7npS4O6 A==; X-CSE-ConnectionGUID: cAJA9k26RSSDrMOW9YPCCg== X-CSE-MsgGUID: rEIyTVqjRK+qIVer3kKHeg== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56778962" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56778962" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:44 -0700 X-CSE-ConnectionGUID: +MJoAehSQw+wsYKAIebirw== X-CSE-MsgGUID: wS52Kd2qRHGiE/T7d50IyA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134013" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:41 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 01/20] ASoC: Intel: avs: boards: Add Kconfig option for obsolete card names Date: Mon, 7 Apr 2025 14:41:35 +0200 Message-Id: <20250407124154.1713039-2-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add backward compatibility Kconfig option to allow for enabling obsolete card names. Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/board_selection.c | 37 ++++++++++++++++++++++++--- sound/soc/intel/avs/boards/Kconfig | 8 ++++++ sound/soc/intel/avs/pcm.c | 5 +++- sound/soc/intel/avs/utils.h | 14 ++++++++-- 4 files changed, 57 insertions(+), 7 deletions(-) base-commit: 3a0f0a4355df0240485ed62b6bd6afa5b3e689c5 diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c index 2d706edcbf924..d00addb24d40a 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -17,11 +17,16 @@ #include #include #include "avs.h" +#include "utils.h" static bool i2s_test; module_param(i2s_test, bool, 0444); MODULE_PARM_DESC(i2s_test, "Probe I2S test-board and skip all other I2S boards"); +static bool obsolete_card_names = IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE); +module_param_named(obsolete_card_names, obsolete_card_names, bool, 0444); +MODULE_PARM_DESC(obsolete_card_names, "Use obsolete card names 0=no, 1=yes"); + static const struct dmi_system_id kbl_dmi_table[] = { { .matches = { @@ -141,7 +146,7 @@ static struct snd_soc_acpi_mach avs_kbl_i2s_machines[] = { .mach_params = { .i2s_link_mask = AVS_SSP(0), }, - .pdata = (unsigned long[]){ 0x2, 0, 0, 0, 0, 0 }, /* SSP0 TDMs */ + .pdata = (struct avs_mach_pdata[]){ { .tdms = (unsigned long[]){ 0x2 } } }, .tplg_filename = "rt5514-tplg.bin", }, { @@ -202,7 +207,9 @@ static struct snd_soc_acpi_mach avs_apl_i2s_machines[] = { .mach_params = { .i2s_link_mask = AVS_SSP_RANGE(0, 5), }, - .pdata = (unsigned long[]){ 0x1, 0x1, 0x14, 0x1, 0x1, 0x1 }, /* SSP2 TDMs */ + .pdata = (struct avs_mach_pdata[]){ { + .tdms = (unsigned long[]){ 0x1, 0x1, 0x14, 0x1, 0x1, 0x1 } + } }, .tplg_filename = "tdf8532-tplg.bin", }, { @@ -445,6 +452,7 @@ static int avs_register_dmic_board(struct avs_dev *adev) { struct platform_device *codec, *board; struct snd_soc_acpi_mach mach = {{0}}; + struct avs_mach_pdata *pdata; int ret; if (!acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_PDM, -1, -1, -1)) { @@ -468,6 +476,11 @@ static int avs_register_dmic_board(struct avs_dev *adev) if (ret < 0) return ret; + pdata = devm_kzalloc(adev->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + pdata->obsolete_card_names = obsolete_card_names; + mach.pdata = pdata; mach.tplg_filename = "dmic-tplg.bin"; mach.mach_params.platform = "dmic-platform"; @@ -490,6 +503,7 @@ static int avs_register_dmic_board(struct avs_dev *adev) static int avs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach *mach) { struct platform_device *board; + struct avs_mach_pdata *pdata; int num_ssps; char *name; int ret; @@ -507,7 +521,15 @@ static int avs_register_i2s_board(struct avs_dev *adev, struct snd_soc_acpi_mach if (!name) return -ENOMEM; - ret = avs_i2s_platform_register(adev, name, mach->mach_params.i2s_link_mask, mach->pdata); + pdata = mach->pdata; + if (!pdata) + pdata = devm_kzalloc(adev->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + pdata->obsolete_card_names = obsolete_card_names; + mach->pdata = pdata; + + ret = avs_i2s_platform_register(adev, name, mach->mach_params.i2s_link_mask, pdata->tdms); if (ret < 0) return ret; @@ -584,6 +606,7 @@ static int avs_register_hda_board(struct avs_dev *adev, struct hda_codec *codec) { struct snd_soc_acpi_mach mach = {{0}}; struct platform_device *board; + struct avs_mach_pdata *pdata; struct hdac_device *hdev = &codec->core; char *pname; int ret, id; @@ -592,11 +615,17 @@ static int avs_register_hda_board(struct avs_dev *adev, struct hda_codec *codec) if (!pname) return -ENOMEM; + pdata = devm_kzalloc(adev->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + pdata->obsolete_card_names = obsolete_card_names; + pdata->codec = codec; + ret = avs_hda_platform_register(adev, pname); if (ret < 0) return ret; - mach.pdata = codec; + mach.pdata = pdata; mach.mach_params.platform = pname; mach.tplg_filename = devm_kasprintf(adev->dev, GFP_KERNEL, "hda-%08x-tplg.bin", hdev->vendor_id); diff --git a/sound/soc/intel/avs/boards/Kconfig b/sound/soc/intel/avs/boards/Kconfig index ba4bee42124cc..8b654181004e7 100644 --- a/sound/soc/intel/avs/boards/Kconfig +++ b/sound/soc/intel/avs/boards/Kconfig @@ -4,6 +4,14 @@ menu "Intel AVS Machine drivers" comment "Available DSP configurations" +config SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE + bool "Use obsolete card names" + default n + help + Use obsolete names for some of avs cards. This option should be + used if your system depends on old card names, for example having + not up to date UCM files. + config SND_SOC_INTEL_AVS_MACH_DA7219 tristate "da7219 I2S board" depends on I2C diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index dac463390da13..7e077c97123bb 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -18,6 +18,7 @@ #include "path.h" #include "pcm.h" #include "topology.h" +#include "utils.h" #include "../../codecs/hda.h" struct avs_dma_data { @@ -1480,6 +1481,7 @@ static int avs_component_hda_probe(struct snd_soc_component *component) struct snd_soc_dapm_context *dapm; struct snd_soc_dai_driver *dais; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct hda_codec *codec; struct hda_pcm *pcm; const char *cname; @@ -1489,7 +1491,8 @@ static int avs_component_hda_probe(struct snd_soc_component *component) if (!mach) return -EINVAL; - codec = mach->pdata; + pdata = mach->pdata; + codec = pdata->codec; if (list_empty(&codec->pcm_list_head)) return -EINVAL; list_for_each_entry(pcm, &codec->pcm_list_head, list) diff --git a/sound/soc/intel/avs/utils.h b/sound/soc/intel/avs/utils.h index 5ee569c39380a..a7aa13a48cf3d 100644 --- a/sound/soc/intel/avs/utils.h +++ b/sound/soc/intel/avs/utils.h @@ -11,6 +11,14 @@ #include +struct avs_mach_pdata { + struct hda_codec *codec; + unsigned long *tdms; + char *codec_name; /* DMIC only */ + + bool obsolete_card_names; +}; + static inline bool avs_mach_singular_ssp(struct snd_soc_acpi_mach *mach) { return hweight_long(mach->mach_params.i2s_link_mask) == 1; @@ -23,14 +31,16 @@ static inline u32 avs_mach_ssp_port(struct snd_soc_acpi_mach *mach) static inline bool avs_mach_singular_tdm(struct snd_soc_acpi_mach *mach, u32 port) { - unsigned long *tdms = mach->pdata; + struct avs_mach_pdata *pdata = mach->pdata; + unsigned long *tdms = pdata->tdms; return !tdms || (hweight_long(tdms[port]) == 1); } static inline u32 avs_mach_ssp_tdm(struct snd_soc_acpi_mach *mach, u32 port) { - unsigned long *tdms = mach->pdata; + struct avs_mach_pdata *pdata = mach->pdata; + unsigned long *tdms = pdata->tdms; return tdms ? __ffs(tdms[port]) : 0; } From patchwork Mon Apr 7 12:41:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040419 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B604524E4A9 for ; Mon, 7 Apr 2025 12:40:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029649; cv=none; b=FaAckPTsGT8SOuKluiwvKodir56+C4Z5F/v/33sl52EwTYw95ce/RT2kIWTf/yrKigBIsVI2j+3PWEp+WOTAa6WUQga3opkUi1McifSC0h+TyKOVA4cvxDmnEdRUUfqs3Zp3rUdZZZatUJtqEbD+PxTQ67wME0VCaUh7+P7nSrU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029649; c=relaxed/simple; bh=rm/X2eKjrsaqOQxH4fDzcCQJEKCs4iJ8EjjNqZRLk7g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=YU2e90BX6TG1W7DcXQBKmQFk2IWOZOwYYVlbQEoh/GXwebVnx/EfJB2wv55jcXq2geybG6gpqVbw3NtVTPTqDeocVt50HrdExh19hM2Bt7wliqTLJvSgD+HTRWesAWACvxdVyxTBNZC6usp7CghsnK5Rg2ARfZ4KLkoNFG4M7SE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=bRWmXfbE; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bRWmXfbE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029648; x=1775565648; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rm/X2eKjrsaqOQxH4fDzcCQJEKCs4iJ8EjjNqZRLk7g=; b=bRWmXfbEEpKQ67aYAjBCF6X0vl6QJS4xmFX9UTyGwhl0hxIxFilTb06T Lua6n6xP5gcM5RuYjgoMFMTJFZ9sIluyipT9pDDKpzEACs/HIGp6jJxks 3k9JZwD8lFVTg4QVtkjQ8kbMzytIsQuj5g3NSMqL5m02awNnK+rOoCp5s cnAbWF/9sJ9wrQjVTRgIi1tAUrnXiPWB15dTnrnosFtIk4Hn73c1Kc1vi mVbu/p4ZedtXpQs+yOCYevcfLc49omNMWWlbTrlfMJlh3/wXR/LaGFUtP CRaOUo+qzJI04CsXge86hqfL0NHxh3YAw5/770u3DvQMGk1PPETKGSDtK g==; X-CSE-ConnectionGUID: 7ZaP43ZiQumd3kMCAsbyug== X-CSE-MsgGUID: vfM/FfezRwe8rq8upHBefA== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56778969" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56778969" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:47 -0700 X-CSE-ConnectionGUID: e/TZOhmJS9OuFO4Omf1f8A== X-CSE-MsgGUID: Fo2+anQTRm+rEdyYfpr46Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134032" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:43 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 02/20] ASoC: Intel: avs: Use topology information for endpoint numbers Date: Mon, 7 Apr 2025 14:41:36 +0200 Message-Id: <20250407124154.1713039-3-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use DAI PCM ID from topology as Front End device endpoint number. This allows devices to be more naturally enumerated starting from 0, like most cards, instead of values like 1 or 2. Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/avs.h | 2 +- sound/soc/intel/avs/board_selection.c | 2 +- sound/soc/intel/avs/pcm.c | 8 +++++--- sound/soc/intel/avs/probes.c | 2 +- sound/soc/intel/avs/utils.h | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/avs/avs.h b/sound/soc/intel/avs/avs.h index 585543f872fcc..71973918e027b 100644 --- a/sound/soc/intel/avs/avs.h +++ b/sound/soc/intel/avs/avs.h @@ -340,7 +340,7 @@ struct avs_soc_component { extern const struct snd_soc_dai_ops avs_dai_fe_ops; int avs_soc_component_register(struct device *dev, const char *name, - const struct snd_soc_component_driver *drv, + struct snd_soc_component_driver *drv, struct snd_soc_dai_driver *cpu_dais, int num_cpu_dais); int avs_dmic_platform_register(struct avs_dev *adev, const char *name); int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned long port_mask, diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c index d00addb24d40a..d021503149a39 100644 --- a/sound/soc/intel/avs/board_selection.c +++ b/sound/soc/intel/avs/board_selection.c @@ -23,7 +23,7 @@ static bool i2s_test; module_param(i2s_test, bool, 0444); MODULE_PARM_DESC(i2s_test, "Probe I2S test-board and skip all other I2S boards"); -static bool obsolete_card_names = IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE); +bool obsolete_card_names = IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE); module_param_named(obsolete_card_names, obsolete_card_names, bool, 0444); MODULE_PARM_DESC(obsolete_card_names, "Use obsolete card names 0=no, 1=yes"); diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index 7e077c97123bb..0f4e35dab7e48 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -1267,7 +1267,7 @@ static int avs_component_construct(struct snd_soc_component *component, return 0; } -static const struct snd_soc_component_driver avs_component_driver = { +static struct snd_soc_component_driver avs_component_driver = { .name = "avs-pcm", .probe = avs_component_probe, .remove = avs_component_remove, @@ -1282,7 +1282,7 @@ static const struct snd_soc_component_driver avs_component_driver = { }; int avs_soc_component_register(struct device *dev, const char *name, - const struct snd_soc_component_driver *drv, + struct snd_soc_component_driver *drv, struct snd_soc_dai_driver *cpu_dais, int num_cpu_dais) { struct avs_soc_component *acomp; @@ -1300,6 +1300,8 @@ int avs_soc_component_register(struct device *dev, const char *name, acomp->base.name = name; INIT_LIST_HEAD(&acomp->node); + drv->use_dai_pcm_id = !obsolete_card_names; + return snd_soc_add_component(&acomp->base, cpu_dais, num_cpu_dais); } @@ -1626,7 +1628,7 @@ static int avs_component_hda_open(struct snd_soc_component *component, return 0; } -static const struct snd_soc_component_driver avs_hda_component_driver = { +static struct snd_soc_component_driver avs_hda_component_driver = { .name = "avs-hda-pcm", .probe = avs_component_hda_probe, .remove = avs_component_hda_remove, diff --git a/sound/soc/intel/avs/probes.c b/sound/soc/intel/avs/probes.c index f0b0109563038..a42736b9aa55b 100644 --- a/sound/soc/intel/avs/probes.c +++ b/sound/soc/intel/avs/probes.c @@ -284,7 +284,7 @@ static struct snd_soc_dai_driver probe_cpu_dais[] = { }, }; -static const struct snd_soc_component_driver avs_probe_component_driver = { +static struct snd_soc_component_driver avs_probe_component_driver = { .name = "avs-probe-compr", .compress_ops = &avs_probe_compress_ops, .module_get_upon_open = 1, /* increment refcount when a stream is opened */ diff --git a/sound/soc/intel/avs/utils.h b/sound/soc/intel/avs/utils.h index a7aa13a48cf3d..955a40d2c30c2 100644 --- a/sound/soc/intel/avs/utils.h +++ b/sound/soc/intel/avs/utils.h @@ -11,6 +11,8 @@ #include +extern bool obsolete_card_names; + struct avs_mach_pdata { struct hda_codec *codec; unsigned long *tdms; From patchwork Mon Apr 7 12:41:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040420 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 997D92512D7 for ; Mon, 7 Apr 2025 12:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029651; cv=none; b=fx4I9l0ekstTydWDWmubfZ0YJ0P0UTcvRwscoWzGpetggmbfeniEO5Q/uFcfRIxuz2Y+RKyRp8Ltlk5GtVpJlVtHW7YltRYmah+Q0gSy3uOoC9R/RUzza6vham+MOditNsmmD0kp/gsHoeTatwvqRNBI6qknMxvSdNdu+VTYmLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029651; c=relaxed/simple; bh=DReUTOnSm0BjzqIWfhF3M+ZJanvsxoWVAHtMjUgIL9s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=uZMDJywPOjPZImYyut7v1glMlJyj+1GfryIT2p+02uM+gT5YrCZLOADlp9pQB+JCSElx8Y99HNPfX4P0qnfi1ZWcksgRdSGU+3HPA5iP9IWqsZWEW3kMiduibHuyqTFukgnn1l4pYLbIonYVKCkB6v02Qom4XikWwtDC7UNfyvo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ReYl9Mez; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ReYl9Mez" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029650; x=1775565650; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DReUTOnSm0BjzqIWfhF3M+ZJanvsxoWVAHtMjUgIL9s=; b=ReYl9MezQw0O8IW7u1ZDO7otXgQl+GZCrUKCVN6kFVGwlkekjax5H67z rkQ9wMaUIRBHA+UyY40V5UDeyuw84PAQZGSUggys0W0qDD8dBbjfyn+Nr 3tA6OvZxzxI/rPL5T8BueJ4pVQshxwNAdfRWDlpTb/OAxEvuFGt0W+pVU wwFT6/YPGvyEN4MPHxVMZUrmlnAf1ALHNnHA+l0AufjV9zZS7I7lSHH9M H8RKnOsdHp0UbBud63jKlQYOMxL2TDFugONsxQEbG6eXArvq2eJqbwtWk jAsof73NSBk6QucpRQ6KWjg65kb0BSo4V52eiXbqD2W/zHZoHAfx5IQ/y g==; X-CSE-ConnectionGUID: 3fBwPaUTTb2DJuq/RQH53Q== X-CSE-MsgGUID: pSNrQHcPRt65IMuZX6SP/w== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56778977" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56778977" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:48 -0700 X-CSE-ConnectionGUID: fuEhek1PTACO8W+cL6Irvw== X-CSE-MsgGUID: GVBXyLavT3KVJJ12TyKMmg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134052" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:46 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 03/20] ASoC: Intel: avs: boards: Change da7219 card name Date: Mon, 7 Apr 2025 14:41:37 +0200 Message-Id: <20250407124154.1713039-4-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_da7219" to "AVS I2S DA7219". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/da7219.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c index 7217ae51e89c2..010e7785ad9a4 100644 --- a/sound/soc/intel/avs/boards/da7219.c +++ b/sound/soc/intel/avs/boards/da7219.c @@ -214,6 +214,7 @@ static int avs_da7219_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct snd_soc_jack *jack; struct device *dev = &pdev->dev; @@ -222,6 +223,7 @@ static int avs_da7219_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -238,7 +240,12 @@ static int avs_da7219_probe(struct platform_device *pdev) if (!jack || !card) return -ENOMEM; - card->name = "avs_da7219"; + if (pdata->obsolete_card_names) { + card->name = "avs_da7219"; + } else { + card->driver_name = "avs_da7219"; + card->long_name = card->name = "AVS I2S DA7219"; + } card->dev = dev; card->owner = THIS_MODULE; card->dai_link = dai_link; From patchwork Mon Apr 7 12:41:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040421 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19F6A22FDF0 for ; Mon, 7 Apr 2025 12:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029651; cv=none; b=VXHZMdrdewUKq4SvPJ1TjU5gEWnjoGIK9W75VlvWTbEmLcBR8/2Qtglk21EfzD6k34qGd8ZFFnUDypQSNGI1VdzWJEyJ3fE/6LtMVIcDfdZ5o9niQ/DxqaDmf4i9TTAbls8y8GJaSq87XsXSfEg2+Xa0oX5FuekhBSXJ50yiqzM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029651; c=relaxed/simple; bh=6fxJNM68+JhHbwgl7qUBjsdkF9KVJz/geGIpyteulYg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=JgpsgLJAJCzADPQkwYDYzIExUMMSSTCAccRjgX7ScCz1VjMROV0RVOk7cD+Onu++manPjhKkYqAH4YoExv+Xk5XB8w6G8HEJE7uEtq6Tk0Es0zb47Tije0+Pkn+HZNxBhuv0DpLiftP7OqX1/9/wANUfeAhMfDAJxFoofHWJ/C0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=YwJ9mJ05; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="YwJ9mJ05" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029650; x=1775565650; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6fxJNM68+JhHbwgl7qUBjsdkF9KVJz/geGIpyteulYg=; b=YwJ9mJ05x9jmjRoZRYUjTrLdL1ZzZeR2we8KVD4iGMG4uL3EQlPY++Et 71VUH/T+PIQVvZeC3mCABKiURXxM2BTW1gjUeAVyXyWoqLlPE+oXXRbWM vuftKbjXwIsELt+UmNtLSd8ApOj5BwhIw3hhEMftYJzKZIXgf//XXw5uw bqS7WwzjwH2GQqiZsQURRgI49lp18i1lMq7BPRCvlI2lV9tglTO1Nkjh7 DaVs8kTzjjVCt3OIev+2ysM609T1W4oky6071OtVkgL+QoK+P05PSwN/N /w0qlbM45YjIS4zkXEkyskXAKLRtdA1bIBz39FErLfWGVhN9wTeWBCV4k w==; X-CSE-ConnectionGUID: UZ0gxyyiRa2QRPqbbBmFyw== X-CSE-MsgGUID: ASuAOJBJSI+FZaMe6aUZJQ== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56778982" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56778982" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:50 -0700 X-CSE-ConnectionGUID: 2PQ6ZB9fRNahCQcrpb8wGQ== X-CSE-MsgGUID: opzW4ZtNSnu5EhLKnl7rsQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134063" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:47 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 04/20] ASoC: Intel: avs: boards: Change DMIC card name Date: Mon, 7 Apr 2025 14:41:38 +0200 Message-Id: <20250407124154.1713039-5-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_dmic" to "AVS DMIC". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/dmic.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c index 4dd9591ee98b7..cda2ddb28add3 100644 --- a/sound/soc/intel/avs/boards/dmic.c +++ b/sound/soc/intel/avs/boards/dmic.c @@ -10,6 +10,7 @@ #include #include #include +#include "../utils.h" SND_SOC_DAILINK_DEF(dmic_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin"))); SND_SOC_DAILINK_DEF(dmic_wov_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC WoV Pin"))); @@ -49,17 +50,24 @@ static const struct snd_soc_dapm_route card_routes[] = { static int avs_dmic_probe(struct platform_device *pdev) { struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct device *dev = &pdev->dev; int ret; mach = dev_get_platdata(dev); + pdata = mach->pdata; card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); if (!card) return -ENOMEM; - card->name = "avs_dmic"; + if (pdata->obsolete_card_names) { + card->name = "avs_dmic"; + } else { + card->driver_name = "avs_dmic"; + card->long_name = card->name = "AVS DMIC"; + } card->dev = dev; card->owner = THIS_MODULE; card->dai_link = card_dai_links; From patchwork Mon Apr 7 12:41:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040422 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78D942512D7 for ; Mon, 7 Apr 2025 12:40:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029652; cv=none; b=A+/ZmE5TkypiWPacHHzlcTy2OEuOgm9YoWV5NUrnPegwIdm5jpmrOBP7DvyxSM6je6rTVQZoQlxFIMP+S8euHumSaM4i0gU798gBSrGvxUo3/pQbxCtTZI6YYIOgVinmNd5QL9S/2kH4haL1juy1LBLlSiEysHRJ8tmxUIu3bhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029652; c=relaxed/simple; bh=7Fpo09ATJWCaxP2P1DjU2D5ND3iJo6SgOMXYx2cGS0Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=PWooPysoQ/bZHRHAoE2Gmf7b+Z867L50pTq1YhQ3R06saWHSDHb4fyiBXTQXiuYlSKbw3bsPgyqUTlUkr0JuJcEWayV3h3vlBga1k6SnAhoZUYV/t4N/8rfb/WSMSDqLefIii0SkPC1GAlrRAZ9HQFlGYnyHT5WXKuBpRLLsBPg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=kF4rzr5a; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="kF4rzr5a" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029652; x=1775565652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7Fpo09ATJWCaxP2P1DjU2D5ND3iJo6SgOMXYx2cGS0Q=; b=kF4rzr5asoKFr6HojJUV6EHE4u9dAe93a1Z9ejpOm0nl7hFm/bkIKlqX dJRAscOZ1pJKZDv4jMHJ9FUjiZnjmNiuE6Dl1b0eEM3p1+hfjUiOr0hHC f6oBfrYWlWmECXU+PQ4cLlrbFU8rCUJABlw5RvVqA6aDBq4KOSVB20urp 5+Qnj7g5CEotOMoKrcSHNffwGLaNO0B2txSPBkUuhAHK2l2IqLBc7aMgR mp7n7kjQ2gHYf/D4W2mFf2OjIt9ex3aV7jPb/4u0ULXfKkKuMGEY1c/Pb jlBPIUCd1vJW/ooaGFIAvWM7eaPYisZTBqz2F+6OH72qWIsJV+c8+MvPa w==; X-CSE-ConnectionGUID: 3IBDkn0LSzCa1J4v6eq/jw== X-CSE-MsgGUID: l2UF5A97TJCLi9MixX2BeQ== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56778987" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56778987" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:52 -0700 X-CSE-ConnectionGUID: vPe+WEnkR2+Oo22kYF2nUw== X-CSE-MsgGUID: y+VJTYJSTgKmVQh72uQPdg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134079" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:49 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 05/20] ASoC: Intel: avs: boards: Change es8336 card name Date: Mon, 7 Apr 2025 14:41:39 +0200 Message-Id: <20250407124154.1713039-6-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_es8336" to "AVS I2S ES8336". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/es8336.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index 6f3c4f6c93023..f528f61e18bc2 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -259,6 +259,7 @@ static int avs_es8336_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct avs_card_drvdata *data; struct snd_soc_card *card; struct device *dev = &pdev->dev; @@ -267,6 +268,7 @@ static int avs_es8336_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -283,7 +285,12 @@ static int avs_es8336_probe(struct platform_device *pdev) if (!data || !card) return -ENOMEM; - card->name = "avs_es8336"; + if (pdata->obsolete_card_names) { + card->name = "avs_es8336"; + } else { + card->driver_name = "avs_es8336"; + card->long_name = card->name = "AVS I2S ES8336"; + } card->dev = dev; card->owner = THIS_MODULE; card->suspend_pre = avs_card_suspend_pre; From patchwork Mon Apr 7 12:41:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040423 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A620222D787 for ; Mon, 7 Apr 2025 12:40:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029656; cv=none; b=tAS0moeJoTX+9hH2C3M9ZkqNuq6h7h957PrZ8nd+ORTibtTnbb7lznrQJ6jlZcu5eDOXceLUfC/+blWU8bjwdEUTXU4RVFuPxPAs59+H/SDLcu46qXsvPn4EqHlbZnQ4wLF3MmEo6HIo+wENP7oi13FbhW5lmArWefPVpn4sq1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029656; c=relaxed/simple; bh=YeiOeVtWOX7ZBZr8nPXTaMi8nYgsaItdBxO+AJk/8ps=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=mK2tDDUZfQHgv03UqUUo/5qakEy3OtXGMLcZKQGoFx7eqM8eEk6Jj1szfGAEKQGXSkUiuIg7B5m4NtK0FPt2eOgIyw3Mp02ObagJ83+fp3FyWvaObR97eH3UJWP5QDBWm399EaSzBdJBfm8zIA1gW04uNcl3kpMrZ952kCcTYdg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Zq1pTax5; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Zq1pTax5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029655; x=1775565655; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YeiOeVtWOX7ZBZr8nPXTaMi8nYgsaItdBxO+AJk/8ps=; b=Zq1pTax5MKl8kFpgpxNE9X4/Mke/r7/mSDa47L4KQZP93eC8n++PUro4 QbBmLOOEBoweOBScSaPPOwwPfEv0dQCtl+xnOiNzfPRW+41bI0whg8m4N 4ic7MfmJp6j9JjrT/IXkXUifeTj6uxy4qQXrX4qKJBE4BbrFuw3nKiKI/ PIpej3DOUIVshjOS0/2dAQXxLQDQUbsA+KlkKf5mMO/xXIDGDvNjg/EUW eYoCBMtrJGNxL08ezzXMi9L5l6z6TdUvtxK4N7kYkCl7XmRA7jgr6Z0Tw lEOXBt/KAFcfiXW1P5ZkY+9NrZQnxMRaFG6ZccLeyhzsNLvpOnhMq9FDL w==; X-CSE-ConnectionGUID: YZw9kPZhSJ+pL0s09EG3lg== X-CSE-MsgGUID: QQLPxXsSTRWRBe07Dcu1KA== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56778994" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56778994" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:53 -0700 X-CSE-ConnectionGUID: vjXrIsQ6RlC2eOckfEgLTA== X-CSE-MsgGUID: dTzung3vRZ6Q9d9R/BYF9w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134087" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:51 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 06/20] ASoC: Intel: avs: boards: Change hdaudio card name Date: Mon, 7 Apr 2025 14:41:40 +0200 Message-Id: <20250407124154.1713039-7-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "hdaudioB0D0"/"hdaudioB0D2" to "AVS HD-Audio"/"AVS HDMI". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/hdaudio.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/avs/boards/hdaudio.c b/sound/soc/intel/avs/boards/hdaudio.c index cb6d54db71892..4b8a2dc4b4a38 100644 --- a/sound/soc/intel/avs/boards/hdaudio.c +++ b/sound/soc/intel/avs/boards/hdaudio.c @@ -13,6 +13,7 @@ #include #include #include "../../../codecs/hda.h" +#include "../utils.h" static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int pcm_count, const char *platform_name, struct snd_soc_dai_link **links) @@ -95,7 +96,8 @@ avs_card_hdmi_pcm_at(struct snd_soc_card *card, int hdmi_idx) static int avs_card_late_probe(struct snd_soc_card *card) { struct snd_soc_acpi_mach *mach = dev_get_platdata(card->dev); - struct hda_codec *codec = mach->pdata; + struct avs_mach_pdata *pdata = mach->pdata; + struct hda_codec *codec = pdata->codec; struct hda_pcm *hpcm; /* Topology pcm indexing is 1-based */ int i = 1; @@ -124,6 +126,7 @@ static int avs_card_late_probe(struct snd_soc_card *card) static int avs_probing_link_init(struct snd_soc_pcm_runtime *rtm) { struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_dai_link *links = NULL; struct snd_soc_card *card = rtm->card; struct hda_codec *codec; @@ -131,7 +134,8 @@ static int avs_probing_link_init(struct snd_soc_pcm_runtime *rtm) int ret, pcm_count = 0; mach = dev_get_platdata(card->dev); - codec = mach->pdata; + pdata = mach->pdata; + codec = pdata->codec; if (list_empty(&codec->pcm_list_head)) return -EINVAL; @@ -167,12 +171,14 @@ static int avs_hdaudio_probe(struct platform_device *pdev) { struct snd_soc_dai_link *binder; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct device *dev = &pdev->dev; struct hda_codec *codec; mach = dev_get_platdata(dev); - codec = mach->pdata; + pdata = mach->pdata; + codec = pdata->codec; /* codec may be unloaded before card's probe() fires */ if (!device_is_registered(&codec->core.dev)) @@ -200,7 +206,16 @@ static int avs_hdaudio_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = binder->codecs->name; + if (pdata->obsolete_card_names) { + card->name = binder->codecs->name; + } else { + card->driver_name = "avs_hdaudio"; + if (hda_codec_is_display(codec)) + card->long_name = card->name = "AVS HDMI"; + else + card->long_name = card->name = "AVS HD-Audio"; + } + card->dev = dev; card->owner = THIS_MODULE; card->dai_link = binder; From patchwork Mon Apr 7 12:41:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040424 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 839F524EF8E for ; Mon, 7 Apr 2025 12:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029657; cv=none; b=l49RR7wcTWQNwDWHNu4fQdgy6W/zXukULKpyIf9o32YYa/DiR2hlGndv+W+NwCdfLA3T9qbrAM3NR6kPrdpMoceRF+VNtjjgaTIiy1tPVd7jG4HhQ2Z1X6E+QS71/A17OU8bmVx1tU3tMWNKq7KLViOrL53Vt8r5GB0KF0PYjYs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029657; c=relaxed/simple; bh=6LIwP+fxd6Gf1mJnkhk5fDt5d6mmIPHuBXrlt2o2nts=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=FeYEVmnoTkcpHl/IfSXRmGOF7Geb394k/8ljNFlTSPWRzCmpj2TPoKcIlrsQyDcmXlD1MIuYgsNPN8TbODreq5djO3PcJDjso7f790VsN7rNuRPu9fv4CILUy/oa676cuSRF7PoPC/cqe00E5O08JohAJeU8ZH7Ef8jK2FSSEeE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=HsbWqCUo; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HsbWqCUo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029656; x=1775565656; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6LIwP+fxd6Gf1mJnkhk5fDt5d6mmIPHuBXrlt2o2nts=; b=HsbWqCUo2NobFxghm/WMTYDD2NAUNvv1vZ1HetOpFxsfkcgPFz0pEZKk DJkUQLr4+ajrrb+zkTWRS+73nm6YxmWx4BLloLf9DrUIlMeuz1yiEfANk 4aMHsnrPZ8p99mSArgWHcmEdxg1yEjE+m79m1SfHuddCQPuy49MbSXc/N AV53lxMlRJGSbOyJLiGFqGobzz5Cj68jxTcQy/vNbR9HnEYuZfRXbX3N1 Mz5cX7mgFDpNBa96MkR1Bc5HgJ3wh/bkxaSkiW64fpc+4apgQjsGTYJ5j EsQZPT711Gz61DhUTap4E/PFOCqcgqZ3tUXMScdeKUvUjy9yZ/DyXs9UH g==; X-CSE-ConnectionGUID: FABlPoWtQO2eVJjLRAp6+w== X-CSE-MsgGUID: kwjN7n7QTKGvLA35QfUvMA== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779007" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779007" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:55 -0700 X-CSE-ConnectionGUID: S6ftx6KgQ32VDzAUyyb9xg== X-CSE-MsgGUID: PxgxnkVWTimhzH2rzHIkLw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134102" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:53 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 07/20] ASoC: Intel: avs: boards: Change sspX-loopback card name Date: Mon, 7 Apr 2025 14:41:41 +0200 Message-Id: <20250407124154.1713039-8-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "sspX-loopback" to "AVS I2S TEST-X". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/i2s_test.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/avs/boards/i2s_test.c b/sound/soc/intel/avs/boards/i2s_test.c index 4556f105c793e..8b6168ba87f41 100644 --- a/sound/soc/intel/avs/boards/i2s_test.c +++ b/sound/soc/intel/avs/boards/i2s_test.c @@ -56,6 +56,7 @@ static int avs_i2s_test_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct device *dev = &pdev->dev; const char *pname; @@ -63,6 +64,7 @@ static int avs_i2s_test_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; if (!avs_mach_singular_ssp(mach)) { dev_err(dev, "Invalid SSP configuration\n"); @@ -80,8 +82,15 @@ static int avs_i2s_test_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = devm_kasprintf(dev, GFP_KERNEL, - AVS_STRING_FMT("ssp", "-loopback", ssp_port, tdm_slot)); + if (pdata->obsolete_card_names) { + card->name = devm_kasprintf(dev, GFP_KERNEL, + AVS_STRING_FMT("ssp", "-loopback", ssp_port, tdm_slot)); + } else { + card->driver_name = "avs_i2s_test"; + card->long_name = card->name = devm_kasprintf(dev, GFP_KERNEL, + AVS_STRING_FMT("AVS I2S TEST-", "", + ssp_port, tdm_slot)); + } if (!card->name) return -ENOMEM; From patchwork Mon Apr 7 12:41:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040425 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C15FE24889F for ; Mon, 7 Apr 2025 12:40:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029658; cv=none; b=hc8sZzM5GSBApGnneCK4Yscl0ybS0D7g99/AQd+3xd4kY6fTCRQvzpg3mrL63zm2AOVbnwTyMjvxRhrkNU9f/u0g00u9MYyr5egZgB2Ch2tbFi4rwM4Eo6ASL4qjQimQvhmJZetFLBaiWQ0xqIXmhoGrCuq0U5RMwbw2JmOhqV8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029658; c=relaxed/simple; bh=uoGuKj3EHbftQvCYhqbBx27ALT8sFjhOTXnJHYNQu7k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=VvQ/quqrzq7AvOPAvu97lTQcaU5ZT2ayG8Cz2HJCIc9A9HcpDyevpTC/gqISuYjpIuvI9W6RDr4KlrveEsa3mZ31XRrr/pjVTNgRFVf9oViipqIRBZTUMKhu/K6QZWZBc5btfVQmcD/jwaS2AkZ0Ac6hHLP9Rpw9ithZuVNyjjw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=L2bvVi4E; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="L2bvVi4E" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029657; x=1775565657; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uoGuKj3EHbftQvCYhqbBx27ALT8sFjhOTXnJHYNQu7k=; b=L2bvVi4EO8Tp7Z1I65rPweaAl+XO46hanbZKQ2rkRN+j2jy3SJnJsJml iDf0vceMkDjVTy/NbM5snpy7wpP/pKJMCxWRD2H8gzbkt+DXzAsXm34AR usj0H6kHsEc8qHuVcUGJsLmZj/iKcOHdDicfPEq6Xm7s28P7eSg/era1V vavwCppJYkPlqlAXHtAv2e4Yy3POf5Z+3w8VGszSjXwbzq9aQWtGOrEv6 q9HT2xd6eR/AxazgF54vgeWDSjtGqx+9cb0SQ87mcdflzAX6SZC2cDnAb 61jIgfJByLHqGoI2i8e3hw+BxFxePJH17i8WAfrIQReHjfaDop9IeEj4Y w==; X-CSE-ConnectionGUID: zO6oJXjNR5C/xSOeC9JUJQ== X-CSE-MsgGUID: c1msfyufQPuMap7xPRPgLg== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779019" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779019" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:57 -0700 X-CSE-ConnectionGUID: sS4kCfs2RFG0pfRqiSWSiA== X-CSE-MsgGUID: DGejermhSHSxnBoq4uckLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134121" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:55 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 08/20] ASoC: Intel: avs: boards: Change max98357a card name Date: Mon, 7 Apr 2025 14:41:42 +0200 Message-Id: <20250407124154.1713039-9-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_max98357a" to "AVS I2S MAX98357A". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/max98357a.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/max98357a.c b/sound/soc/intel/avs/boards/max98357a.c index c55c1d60b777f..d6be251987e1a 100644 --- a/sound/soc/intel/avs/boards/max98357a.c +++ b/sound/soc/intel/avs/boards/max98357a.c @@ -93,6 +93,7 @@ static int avs_max98357a_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct device *dev = &pdev->dev; const char *pname; @@ -100,6 +101,7 @@ static int avs_max98357a_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -115,7 +117,12 @@ static int avs_max98357a_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = "avs_max98357a"; + if (pdata->obsolete_card_names) { + card->name = "avs_max98357a"; + } else { + card->driver_name = "avs_max98357a"; + card->long_name = card->name = "AVS I2S MAX98357A"; + } card->dev = dev; card->owner = THIS_MODULE; card->dai_link = dai_link; From patchwork Mon Apr 7 12:41:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040426 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9B8D24889F for ; Mon, 7 Apr 2025 12:40:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029660; cv=none; b=FneZwvORskrb63f7PevD4K1kwSrcMmz9KSP2RbdipZ42kAy4nYGur8Teib/iVyzjVKLnEIIT5aHvGqx7rVMEYn0+1U9EdOw+Dcii/P5cz6zImv1yROj5RtVjPyGc5CM3VvO1MN/rlKCbEEfu1z3NhePvv9CmjFu2KnIuxdyMeqo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029660; c=relaxed/simple; bh=Jc6d8kcpltewGchRF0pZbZopNG1T7HJqMPK50xkoyrc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=kh84jWfDX3SYLhlv3HCwuoZxp4UOcTSYfb5gOsJfvvG+qvod4Wi8M5IcKJstn7roE05VWoSm6IaVxmQ3n1tjhakmiDJSACRNbJavjjuCIr2Z+vUM17DFFUSLCwZvlvtrkAHqrPDmcaSjSyaSHaRuEzcYZd4mHFbwwRWuW1RS3sY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=U8xlV9GY; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="U8xlV9GY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029659; x=1775565659; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Jc6d8kcpltewGchRF0pZbZopNG1T7HJqMPK50xkoyrc=; b=U8xlV9GYYPAhgrZCwVmWzedPZh98kp3BsMQ03Lre8tT75qI8w9Ukj6yo gN77qEJWGoig0KqucnsCC68QU70QPNRiWFQZcHw7h+HK/HAZqS1ZP3eh0 lPCkffw9DBoTwQcZTnYmGc/xcoGz2B3Ljqpem5NSpIw5wGe6FG3nTROG+ 6rdJI8r/QMKCnvbI4mN05JSb71eM8r1mi2PvmSj04/2aCV1D4+vMwdMZn UjNnowTdIqVh6i/NeLOhaE2IWfhluLMd+YU47XTajW0AUhmsl4LHJIcal cw7A5nFLRL0O7cGz29uZgGVyFQfZs2qKPgoYxUg4FbXxsGl0tbs74NLX4 w==; X-CSE-ConnectionGUID: Akf1HV4BSQ+P6B85p1VH/g== X-CSE-MsgGUID: DZNzdht7SUeDdLbmMoR7rw== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779024" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779024" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:40:59 -0700 X-CSE-ConnectionGUID: diSUz/J9RmGVLKBLxP/FuA== X-CSE-MsgGUID: KKd/L3nLTiedSaPrUx7VpQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134136" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:56 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 09/20] ASoC: Intel: avs: boards: Change max98373 card name Date: Mon, 7 Apr 2025 14:41:43 +0200 Message-Id: <20250407124154.1713039-10-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_max98373" to "AVS I2S MAX98373". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/max98373.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/max98373.c b/sound/soc/intel/avs/boards/max98373.c index 970f82bf4ce89..c4245a9c7707b 100644 --- a/sound/soc/intel/avs/boards/max98373.c +++ b/sound/soc/intel/avs/boards/max98373.c @@ -146,6 +146,7 @@ static int avs_max98373_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct device *dev = &pdev->dev; const char *pname; @@ -153,6 +154,7 @@ static int avs_max98373_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -168,7 +170,12 @@ static int avs_max98373_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = "avs_max98373"; + if (pdata->obsolete_card_names) { + card->name = "avs_max98373"; + } else { + card->driver_name = "avs_max98373"; + card->long_name = card->name = "AVS I2S MAX98373"; + } card->dev = dev; card->owner = THIS_MODULE; card->dai_link = dai_link; From patchwork Mon Apr 7 12:41:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040427 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 839F722F178 for ; Mon, 7 Apr 2025 12:41:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029661; cv=none; b=sjlInLK8AirOOrhOjcdhH9DeMMItAmi6gXIog2sL3vE1ONAViLfc6GQfs5flqIgJbsA911+UcbBmhZs8KGmk+8JzFVqnkWWTvmRn4klhQO1CnOhYfyyJxoo7lJWpExI3IBHxv1iew3h9FDZqg0/zQvZ2iuA2FWoxys7WvXf0JSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029661; c=relaxed/simple; bh=wX1qciDJsnGbJbmLIdUNB7bKdMIe6Q+ljKlcsocMvYU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=nN3BINtV3MLe5azcrkQ8PXPemY9U5e2xdWLniCYsgiS1gO7VNGLB1G+GpztiwmXKxz6PJWU5zM8U4QnxbHlmyijDWFnjJ3TrgmcTl885czb2oWaGR3Kpfu0xjxd/EA0YZ4COw/w2NbnheEAK7JpD3NIzuJAYL/+oy088GyN+5QE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=gqjX4VSy; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="gqjX4VSy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029661; x=1775565661; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wX1qciDJsnGbJbmLIdUNB7bKdMIe6Q+ljKlcsocMvYU=; b=gqjX4VSyFQN2AYJ6h2FP4z3VwRWEHZ6fUS8DV7gADIXWgry0pH/laAZ9 ybrC4KmN8uxQycGrlFYmuxZl5RQWAi0RxXvJX/CMiGFxGbFTPR6hHcenp XPi04ZzWkxEr+DtgNmx3vB+dFNohKxGctFZQgDEekJdmyIiNkT2okUT/R gpGwhrAlhSj1lycUXLaP9UqhpqgyMzyJh3FBeuAVdFyIsTFM+5QiT401q KvPedcTbgX4AoXnwvVGl0xGgjQnrz5oZ979Vz1s25CWhZxSs/mi3MrfwI jtZYinaA/Dzxmw3Pwi5zWHostIO2NPt3gtMghovSJt9o5BOlQKmKgD9ex Q==; X-CSE-ConnectionGUID: yt4W6nPNQWWKt6EhogxgdA== X-CSE-MsgGUID: mP3NlW/uTj+7B3HaWeaJOQ== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779029" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779029" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:00 -0700 X-CSE-ConnectionGUID: uPI69x4KRT6qorKRb2iZYg== X-CSE-MsgGUID: GqYKFnPXTF6K2dS2OyNZsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134154" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:40:58 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 10/20] ASoC: Intel: avs: boards: Change max98927 card name Date: Mon, 7 Apr 2025 14:41:44 +0200 Message-Id: <20250407124154.1713039-11-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_max98927" to "AVS I2S MAX98927". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/max98927.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/max98927.c b/sound/soc/intel/avs/boards/max98927.c index e4ce553bf1d64..d78019d4565ec 100644 --- a/sound/soc/intel/avs/boards/max98927.c +++ b/sound/soc/intel/avs/boards/max98927.c @@ -143,6 +143,7 @@ static int avs_max98927_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct device *dev = &pdev->dev; const char *pname; @@ -150,6 +151,7 @@ static int avs_max98927_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -165,7 +167,12 @@ static int avs_max98927_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = "avs_max98927"; + if (pdata->obsolete_card_names) { + card->name = "avs_max98927"; + } else { + card->driver_name = "avs_max98927"; + card->long_name = card->name = "AVS I2S MAX98927"; + } card->dev = dev; card->owner = THIS_MODULE; card->dai_link = dai_link; From patchwork Mon Apr 7 12:41:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040428 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1CD7230981 for ; Mon, 7 Apr 2025 12:41:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029663; cv=none; b=RzsGdwbLwv0J1qTvqLLwoYumzJ4RbfyT+OPRBndd/k4Zw35DvuouW2HqMeKAY87pRHJaobrQqG3T3ffpBdyIhGwFbFEbgwgWd90tz2J+y7MOEbKMe8AXt5cxrkYoVMMXnEU5b3CxUc4/kg/bdFvzk2HnTcGvrKGAEzhTRB31Epk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029663; c=relaxed/simple; bh=nYUT4H2c3NAoSQLR9nemzd/15zS3R/imhpc+fckOT+w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=spYN4Nthu/LOGtv8b9fuR18CpaKLVjunbrP/nA9cgKdszR8noquFDpfyBJfIy2HeGX/0yiSPZoyYqB7Evj2asgi5Qk4d3wbDCiDUqZBBJ5o/bWzUO+VvmZjGsJy/xoGM3dPpzxa5YW/GGVmx/T+Ox3HtMQZLS944Hz+k5b6h52Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Di4OaNQo; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Di4OaNQo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029662; x=1775565662; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nYUT4H2c3NAoSQLR9nemzd/15zS3R/imhpc+fckOT+w=; b=Di4OaNQoieNZAnZeLBoF8eP5JGYSstwjpg8rpz43AJZ7G+PTGFZ0YnY1 sEuOKitGwqafEbc9QxsMrucpmjYzPzjua2bgMMHOCt2WafK8L8e6DRucE Xw/hx0UdVDDpJiCoLLVJUKMxqIjHXNpyPnBdc+6h1Q2rvlaGoPPUMJJc2 IucwuZxLUlx9vkhGBqSuNjC/SzeC9u8YiDNTexmJgeV00P7QrgQ/PmfDJ Fiq2zKk2is/miX6/1ytLGhN337j6hf+MVmKvr1yovtH8/Q86gdzNIFnjC P6rorfjsbcBuP2LxOYhwL04Hz2oMyKI2dRxTuQtErxZqz2t1q0lz4NXLn Q==; X-CSE-ConnectionGUID: mZgF34kOQUyx2p6czYiVgQ== X-CSE-MsgGUID: mjmSEdS7QbWxSFK0lAEdDg== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779041" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779041" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:02 -0700 X-CSE-ConnectionGUID: +LvyaJZrQzG6aUdPbshWXQ== X-CSE-MsgGUID: RbqPJavDTHa3l4D4ajyFuw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134167" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:00 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 11/20] ASoC: Intel: avs: boards: Change nau8825 card name Date: Mon, 7 Apr 2025 14:41:45 +0200 Message-Id: <20250407124154.1713039-12-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_nau8825" to "AVS I2S NAU8825". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/nau8825.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/nau8825.c b/sound/soc/intel/avs/boards/nau8825.c index e203ceb83b871..465dab7b3ad86 100644 --- a/sound/soc/intel/avs/boards/nau8825.c +++ b/sound/soc/intel/avs/boards/nau8825.c @@ -246,6 +246,7 @@ static int avs_nau8825_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct snd_soc_jack *jack; struct device *dev = &pdev->dev; @@ -254,6 +255,7 @@ static int avs_nau8825_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -270,7 +272,12 @@ static int avs_nau8825_probe(struct platform_device *pdev) if (!jack || !card) return -ENOMEM; - card->name = "avs_nau8825"; + if (pdata->obsolete_card_names) { + card->name = "avs_nau8825"; + } else { + card->driver_name = "avs_nau8825"; + card->long_name = card->name = "AVS I2S NAU8825"; + } card->dev = dev; card->owner = THIS_MODULE; card->suspend_pre = avs_card_suspend_pre; From patchwork Mon Apr 7 12:41:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040429 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8065230981 for ; Mon, 7 Apr 2025 12:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029665; cv=none; b=tspksQQmTle5HIRZtObjcf67mvhF3bDtfZv59ySn2HHgIaHC4eO72ElA/B3bwlRrapNlzbKPZLInkFK8YnlOSnydRDPi21pdcuyrAKNzvcOoY0tIBmpaaaXUzam9NIbbRBrC0ywZTNfFZVrvI/6jcJ/HYUhGYRlFJmV1ch9OoHA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029665; c=relaxed/simple; bh=r+hsD7ymnvF0yiB95T96lnnpSTK7C4IH7a4OZREcP4Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=iXaYjDKB+edNUZGTgEdAPnoomKQEziZFbzvzMTDmpFutu+Sl3ktZa+gYHHAeLHKbusyu3vTKeF3SPdUOJNJsvX9h5e02WtZjiMfXvofINX+yqEyq6P0suY9PyJbW9gcDGbJwTXdUVyqZMcFT+sg3qX+j3loZJsA5UJw0WQc3wyc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=LYOadws0; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="LYOadws0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029664; x=1775565664; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r+hsD7ymnvF0yiB95T96lnnpSTK7C4IH7a4OZREcP4Y=; b=LYOadws0RkOkVl54kC5PiYHHejNfODOsFOJ+oLBpB2VgPOOpkrf2JRbl 3KWOY+gZXuxl2tWLNvUacQNKpjJhjviQUAdsKWG4VTJMl/0pRptvC8YtF +wIuoBYUOiy1v4VDI+xviKXEQoZH5f0mQR+/MhcbaA7Usvv93UkXLsngo rxMo3wY82V2BmYuHCsstcj36mebRbChysKtrNiO9l9bISReRF1Lnks8QS TE1i/BYhkhgdcxWFGG0xAfglrOMFdK5eiVA2kMU8LtwZ9ETzxZaIkgNLf 8CRQCvkncebeeSFrqv1WrCsqhBWwr0XYqMDeAJi58W1pJ+OkKzfOVq1Va g==; X-CSE-ConnectionGUID: MzQqodunQFCcnS2MkJH1YQ== X-CSE-MsgGUID: VUDeMaxvSwGn0XDpOGXFoQ== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779050" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779050" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:03 -0700 X-CSE-ConnectionGUID: aW6yzHmWR7C1u0VNFCKV6A== X-CSE-MsgGUID: piomnBe+ShKLjK2GSY4NEQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134193" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:01 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 12/20] ASoC: Intel: avs: boards: Change pcm3168a card name Date: Mon, 7 Apr 2025 14:41:46 +0200 Message-Id: <20250407124154.1713039-13-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_pcm3168a" to "AVS I2S PCM3168A". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/pcm3168a.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/pcm3168a.c b/sound/soc/intel/avs/boards/pcm3168a.c index 5d0e7a5bdc749..1ebbc92df6b63 100644 --- a/sound/soc/intel/avs/boards/pcm3168a.c +++ b/sound/soc/intel/avs/boards/pcm3168a.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include "../utils.h" static const struct snd_soc_dapm_widget card_widgets[] = { SND_SOC_DAPM_HP("CPB Stereo HP 1", NULL), @@ -95,10 +97,15 @@ static int avs_create_dai_links(struct device *dev, struct snd_soc_dai_link **li static int avs_pcm3168a_probe(struct platform_device *pdev) { + struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct device *dev = &pdev->dev; struct snd_soc_card *card; int ret; + mach = dev_get_platdata(dev); + pdata = mach->pdata; + card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); if (!card) return -ENOMEM; @@ -107,7 +114,12 @@ static int avs_pcm3168a_probe(struct platform_device *pdev) if (ret) return ret; - card->name = "avs_pcm3168a"; + if (pdata->obsolete_card_names) { + card->name = "avs_pcm3168a"; + } else { + card->driver_name = "avs_pcm3168a"; + card->long_name = card->name = "AVS I2S PCM3168A"; + } card->dev = dev; card->owner = THIS_MODULE; card->dapm_widgets = card_widgets; From patchwork Mon Apr 7 12:41:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040430 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5B36C24EF73 for ; Mon, 7 Apr 2025 12:41:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029666; cv=none; b=Maelpk7hxQdrYsSNIus3LOG7YFspoOxW0DDoq8ItHkAPqi/3N0Gs7ud+axh5hK545YZrkVoFOjBqq2QDu52+zlrQF+KC/qLq/oY/DwOa8k42ffTNWfk8qEeF4G7ez360z7XtVOBlwP8LEo54y3InPIZBgsXhlxXa+uIC2TZSkSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029666; c=relaxed/simple; bh=z88CUaUvEGcdWCteOlAhvY8GwqF0lM9g1pIdOQLIBXU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Jw4mXwdTNKvfAIZMweIcOusiYsV4cVWiSo9zVijbsJn6xvfiKM8883g1A/iv2ExKo3qbJ+5f5oVJNS77dA8qq+5ZQZYKBbhaaMyEmHmw5SSqWVy9j9o3P4zI6ReiNKIyVrUDMVz7ECo+UysibOUDLSx5AjWCzA5AVErLJGVsULo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fTkiiG+M; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fTkiiG+M" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029666; x=1775565666; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=z88CUaUvEGcdWCteOlAhvY8GwqF0lM9g1pIdOQLIBXU=; b=fTkiiG+MRUznItpcItJXeFo7oEPUOzG5NXvIn36hvp5YY7RPNOPvKgoD 4Omw3bUmUU4ndvgMYdq2QuenlQhft6J0ZZ6aaRU9rNyzxL65k4hR1uzZR HAqhU1xyiYL053qf/aE5Qm4rMnFfAzCgfxl9SfCZ1Av4Us0Hm0DvRP7hH 8KT3QoWkou7zydM+qQWE9xpjcjJqyjMJNxzrgW6T/YHzTvVC7c41s+jiE ZeteiZvApr754AcKYDg6nBjqItoN72ihV5g1TlU05qDptL8a/nSmNw+9t 8fK+4jh90DUSg2MUu1KiZ52Aatt8squ5J+boGsW59qqLBUWxcgPtWnP2m Q==; X-CSE-ConnectionGUID: 4HdekguzSKKHWMbWycUIww== X-CSE-MsgGUID: p2RF70S4TKmpTc7kqwZuKA== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779060" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779060" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:05 -0700 X-CSE-ConnectionGUID: +xBAuhr+REaX0s94gTCF0w== X-CSE-MsgGUID: Nc97bA5USz+/Ak29qCJ92g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134211" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:03 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 13/20] ASoC: Intel: avs: boards: Change probe card name Date: Mon, 7 Apr 2025 14:41:47 +0200 Message-Id: <20250407124154.1713039-14-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_probe_mb" to "AVS PROBE". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/probe.c b/sound/soc/intel/avs/boards/probe.c index 1cdc285ab8101..3c4491c87df4a 100644 --- a/sound/soc/intel/avs/boards/probe.c +++ b/sound/soc/intel/avs/boards/probe.c @@ -36,7 +36,8 @@ static int avs_probe_mb_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = "avs_probe_mb"; + card->driver_name = "avs_probe_mb"; + card->long_name = card->name = "AVS PROBE"; card->dev = dev; card->owner = THIS_MODULE; card->dai_link = probe_mb_dai_links; From patchwork Mon Apr 7 12:41:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040431 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FD962512D7 for ; Mon, 7 Apr 2025 12:41:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029668; cv=none; b=rU99k/jlYMlPPeSljI0O1+gfxXcEDiCzJVJg0HCby4jgvaCDCnJxAsySrM6XHDuup6jjnU4SdGY3eX/YXuX6kUG1wNyRce+uTyhs9YM8cUDS6VwVinjIhPGrzJgu1U2XIsR4QzHqtFTTRsL9wWi2VTUn2aPSR7tUqe6sRiL+IDs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029668; c=relaxed/simple; bh=sptTWAvT4jCnFEOhqnfx5/A1EMhO3493Z2Ej/09vXxw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=F/6T+RILJplKRdj4b8OwzprCCVWk9T11uWkG2W0+sw1Ri9R9tzQMri5DFIpRuIXuqQGkHoBCECFycI5awGnonZzoyvOqxK4EnKmpibZwWrBXcmTLc2mkekQTvtWpGaWtpfU+Uw68E/vEItxggF/OaVmxTHzZ01y6Cs5uYfjmjn0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=MC67cvhh; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MC67cvhh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029667; x=1775565667; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sptTWAvT4jCnFEOhqnfx5/A1EMhO3493Z2Ej/09vXxw=; b=MC67cvhhnPwzMKqpBCvB2BaR5qBzYrV13tyz6bZkKQn38AEX+olxliOb hjSG/Mm4NY2rtIXKxO0qLPZv9wjbWPNwWhd+qYWDNxul4ZYX9nYTrajtL STcKkJ7zKqD0vWL74mIsVND0HCnIzmZDGLynszEQ/6cmP7gOk6LFyab0b m3z8iLrR0JRiJilDyf1M8kgilRUp3woIC2a11IjXcfHTo7pG5GoDdgYpt 7P18vezOOaf2JTfYdufZzXg905hza/pyDjIFU/CEIGdZqWGFPfgR+3nMo QfAxgdTmPYyrMTnMooBgiEgpDf+q+0C1k/7T+PGP5PDQTB+0+7krOg1wn g==; X-CSE-ConnectionGUID: pPHIHuQ1ScKZ4t+cw3AG+A== X-CSE-MsgGUID: fH1qivARQ4uqVBGFJ9/VGw== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779070" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779070" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:07 -0700 X-CSE-ConnectionGUID: E4OyS8pzRUeIrq/azFa3Kg== X-CSE-MsgGUID: qtaeIGLcRn++ECgUuvtI+g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134227" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:04 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 14/20] ASoC: Intel: avs: boards: Change rt274 card name Date: Mon, 7 Apr 2025 14:41:48 +0200 Message-Id: <20250407124154.1713039-15-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_rt274" to "AVS I2S ALC274". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/rt274.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/rt274.c b/sound/soc/intel/avs/boards/rt274.c index 29977aee2153b..10646986c949f 100644 --- a/sound/soc/intel/avs/boards/rt274.c +++ b/sound/soc/intel/avs/boards/rt274.c @@ -210,6 +210,7 @@ static int avs_rt274_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct snd_soc_jack *jack; struct device *dev = &pdev->dev; @@ -218,6 +219,7 @@ static int avs_rt274_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -234,7 +236,12 @@ static int avs_rt274_probe(struct platform_device *pdev) if (!jack || !card) return -ENOMEM; - card->name = "avs_rt274"; + if (pdata->obsolete_card_names) { + card->name = "avs_rt274"; + } else { + card->driver_name = "avs_rt274"; + card->long_name = card->name = "AVS I2S ALC274"; + } card->dev = dev; card->owner = THIS_MODULE; card->suspend_pre = avs_card_suspend_pre; From patchwork Mon Apr 7 12:41:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040432 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2655824A06A for ; Mon, 7 Apr 2025 12:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029670; cv=none; b=TkyNQCF6j9R3eiqrYuCm0jUyLSTNg9v9eNb8FwI27df3BqllgRSZuDSDdO6/ZXYbDIQwc0sWXIFOoTj45ow6ItVC4Wpfa6EPCNSSfGK/5YxRLq+r1cbobG/OvaJ1xNRDPXsGPB9nWIEd5OXli0UzOnyBooD7aIyo7yqX/UBGhH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029670; c=relaxed/simple; bh=zdZY360TkXXcq0DSo8YfjEhRWzUXI2M21xaWtzxy5CI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=bdpHC43C83CgC8BJhyrFIaTlkx4OcVJ3Iqh3VcLedRmKmRc07y5pna1uFmvD850BNJogbaio3aamEWnRUAsKbaq0ydDrzBvXlmyfVJ81TmBib4tBuCpONj/XzHL6K3B4IpjnsZyRCcO1WiDDhVdtWp07fFDQ58Q0leFzOQTiAHw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=oB17MM+E; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="oB17MM+E" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029670; x=1775565670; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zdZY360TkXXcq0DSo8YfjEhRWzUXI2M21xaWtzxy5CI=; b=oB17MM+EMv/F8bEBW3RgnPqX03q8ZNoqQ5A+lIkwL72QAE2FWAaIaY3Y Kt8oB+BjPk+1mEZH5i2/1ghUpKaHaXE5+Hl1mNQ+gUbJPYSozMpot+44s EHAr6YCTBQGd7GmxRguvRAsLut5XAW+fuqgLuP0SFyet3xCqx6vjM+rRH ZW2W2fPRk+BlHzYMgPqUCUS6RWQy9nB72HPR9KrAzLVpfMGEDfr+T6XWC /ZvbILaqIOlzMxSKZj9aQTIxdvXOyHB7BQ4wtdCKvZBqVGdHwPPdmp4nf q1BsjSNqLg/+J9jUvFcIdQg5brAg9wt3U5brlqvTWxAfrcYuhQBEMV3j0 g==; X-CSE-ConnectionGUID: vU4NfLF+Rl67Cc11AKSAgg== X-CSE-MsgGUID: b9qZm3ErSwC5JZ18du9HbQ== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779081" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779081" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:08 -0700 X-CSE-ConnectionGUID: kc/bG9ieTASm+1F1lBFwLw== X-CSE-MsgGUID: z6Xexk4iRrSUa8U7S7HVyg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134248" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:06 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 15/20] ASoC: Intel: avs: boards: Change rt286 card name Date: Mon, 7 Apr 2025 14:41:49 +0200 Message-Id: <20250407124154.1713039-16-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_rt286" to "AVS I2S ALC286". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/rt286.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/rt286.c b/sound/soc/intel/avs/boards/rt286.c index 6a27c6a9f3941..140f9492632d2 100644 --- a/sound/soc/intel/avs/boards/rt286.c +++ b/sound/soc/intel/avs/boards/rt286.c @@ -179,6 +179,7 @@ static int avs_rt286_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct snd_soc_jack *jack; struct device *dev = &pdev->dev; @@ -187,6 +188,7 @@ static int avs_rt286_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -204,7 +206,12 @@ static int avs_rt286_probe(struct platform_device *pdev) if (!jack || !card) return -ENOMEM; - card->name = "avs_rt286"; + if (pdata->obsolete_card_names) { + card->name = "avs_rt286"; + } else { + card->driver_name = "avs_rt286"; + card->long_name = card->name = "AVS I2S ALC286"; + } card->dev = dev; card->owner = THIS_MODULE; card->suspend_pre = avs_card_suspend_pre; From patchwork Mon Apr 7 12:41:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040433 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B22624EF73 for ; Mon, 7 Apr 2025 12:41:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029671; cv=none; b=RY9804dQmkSDQtk3WiBV3vzy0PDyIkYwb2GufKezwdHD+c5V7PoQti8U3z1gmxiacdKgzxSk6icim8rg1kX1TDIDOMitQAHZGKlxDItJ6yTh/nR92MPwL0bjy5AwM/a26s4IEBxKdTiUF6KYK5imoIFkD6PeNGf5w3z7Sn8TaiA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029671; c=relaxed/simple; bh=LkDFLrW0bdiBGbtQG8jvvFWCtRZA8D1EY3l3/nmDFL4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=mqQC2yLzwqu+olILaE9Crd7/ZP5Ibdpn1YxCudo360r8C47H3xxgir2XEvz0CW/JoLPGWo38GMdyGUCXSNNyJrwMAKmeLwypTnhv00BnaLwVtUk1a+dVT5PIAquJoLpXHDYJUPHqXyzx9o6n1/wDarYNhOT0DUY6eCbyNnVeA6Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=WznVaVfe; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="WznVaVfe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029671; x=1775565671; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LkDFLrW0bdiBGbtQG8jvvFWCtRZA8D1EY3l3/nmDFL4=; b=WznVaVfebTimXdAzi6arki5JQ/hWfAsvdjamURlnPKnSHuzopTO7j0WP +KU4XsPjLz84ISHrejDdCVNKe/2Ma+kyWy1lBJq7tRrEfir0BLZ/jvs5v QyObFtOT1KweKTUC/jU+l7sifQR2J1DA3V02yvquzauVTsuW11ufiTJX4 GAQM2JpqDe3RbXLb9FmCo3h0gqdVms5FmKlAoxP20XtUinmmRBWNSa4t1 oDTSFA5H8uGz0BjDhgwSVXNV+Blo4PFhxtwiq52hPUBMf+T+bTUD33TTS 6JWPtD1cHIlXqJCWKcrJqb7h2nw1sAbVS+VtqW0fLfj+R2YPmp5AUqcvC w==; X-CSE-ConnectionGUID: 7nxUkjzdR1uANp2fRiMpPg== X-CSE-MsgGUID: TynBrHpeQjGPMFgsMKVqrg== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779089" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779089" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:10 -0700 X-CSE-ConnectionGUID: 3Lq5kdB/Q0une7Q1yIfIhg== X-CSE-MsgGUID: wzWQxKwXTL6htiKQ98BJjg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134262" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:08 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 16/20] ASoC: Intel: avs: boards: Change rt298 card name Date: Mon, 7 Apr 2025 14:41:50 +0200 Message-Id: <20250407124154.1713039-17-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_rt298" to "AVS I2S ALC298". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/rt298.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/rt298.c b/sound/soc/intel/avs/boards/rt298.c index a7a463d6f8521..a7b4973cd481b 100644 --- a/sound/soc/intel/avs/boards/rt298.c +++ b/sound/soc/intel/avs/boards/rt298.c @@ -199,6 +199,7 @@ static int avs_rt298_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct snd_soc_jack *jack; struct device *dev = &pdev->dev; @@ -207,6 +208,7 @@ static int avs_rt298_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -223,7 +225,12 @@ static int avs_rt298_probe(struct platform_device *pdev) if (!jack || !card) return -ENOMEM; - card->name = "avs_rt298"; + if (pdata->obsolete_card_names) { + card->name = "avs_rt298"; + } else { + card->driver_name = "avs_rt298"; + card->long_name = card->name = "AVS I2S ALC298"; + } card->dev = dev; card->owner = THIS_MODULE; card->suspend_pre = avs_card_suspend_pre; From patchwork Mon Apr 7 12:41:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040434 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5F2224A06A for ; Mon, 7 Apr 2025 12:41:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029673; cv=none; b=GBZyCak1iVFy4AjYjPZ53QtZssISGprzVQXnlV8DSRwqbz77KV3YA6W/OHwdD8RoSx9nmRiFWtcEzYXE9Lpj0nkB2d761T8Qs73kAIVYp3N6qsqtelem63u2ZR6spvgI9+X3h3TOZd+ywshNwEe1oNevkVcztLrwibbnQIjYJBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029673; c=relaxed/simple; bh=2qlGUjhAfl3RctOvsQDrKTagFOCsbPNjl3njec9aXbI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=DlZeN4K4aInGuN4D+iMGuaR2Lb8FrjdqWEcL9mBeQaLGMh6ZsfeYb0SIaxsKO+lXq7CSrXWlm+Vz1knPmA8DNMqZRo4lWMG3JSxOf6CshrTVD1CD/vBpWB1JLpJ+WNVInMEjFXONHuzvdiRequN9lxFsKLrgmlePZCwd3GCGXsc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=QmAQkvVU; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="QmAQkvVU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029672; x=1775565672; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2qlGUjhAfl3RctOvsQDrKTagFOCsbPNjl3njec9aXbI=; b=QmAQkvVUsDq5zra6uA4D3q3itIwcY0DmDubNFHa53K+YkGXBbqAXRYkN oxk3kXmY+7jdAsan6IsDraWmPJ0oc8poowxmu+i0w726f4TeWrsMfW3Ns OlfgpDy/JYcibg482XDAw/G93PizDrGR5RqOgjANxtrSKmt+WXqH9NCw0 5gCYkzUtvvufBHhoqCs+NeZMyzZ9UIu3zlhccw3ByaXEwv/TtlFmGvLnJ Ys7zYprZpTojgW0BLrovvcjzdFSpQG0LIUnmlHMIfFhfdDBhxjr1gKPkD q8nPlCFHQ7oQwwmpoKQ8gmuC3i0KwQcoWXrXl1TeVbGHysodxoXNIs2Sw w==; X-CSE-ConnectionGUID: 2bkt4un9RjmgchOOsD5h+A== X-CSE-MsgGUID: a7/cVJ7iRj+x9wq6W7ZBwA== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779096" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779096" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:12 -0700 X-CSE-ConnectionGUID: NnTxoYP/Tlend0jPb0+nkQ== X-CSE-MsgGUID: PWgBKGu/TqiYdcFogA9PGQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134268" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:09 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 17/20] ASoC: Intel: avs: boards: Change rt5514 card name Date: Mon, 7 Apr 2025 14:41:51 +0200 Message-Id: <20250407124154.1713039-18-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_rt5514" to "AVS I2S ALC5514". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/rt5514.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/rt5514.c b/sound/soc/intel/avs/boards/rt5514.c index d1c3e29a28ff6..445e5801693ca 100644 --- a/sound/soc/intel/avs/boards/rt5514.c +++ b/sound/soc/intel/avs/boards/rt5514.c @@ -133,6 +133,7 @@ static int avs_rt5514_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct device *dev = &pdev->dev; const char *pname; @@ -140,6 +141,7 @@ static int avs_rt5514_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -155,7 +157,12 @@ static int avs_rt5514_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = "avs_rt5514"; + if (pdata->obsolete_card_names) { + card->name = "avs_rt5514"; + } else { + card->driver_name = "avs_rt5514"; + card->long_name = card->name = "AVS I2S ALC5514"; + } card->dev = dev; card->owner = THIS_MODULE; card->dai_link = dai_link; From patchwork Mon Apr 7 12:41:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040435 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2CEC424EF73 for ; Mon, 7 Apr 2025 12:41:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029674; cv=none; b=Nhid4C81H6JHDibwZ0krH76ShlR4KJdoTWgeg0mdvoRBtDSfhjAnUBOLjO0wlA3iUBAbzemcFeiqOvV+Vs3D9ys2DvCaPmSO48+NonZ82Y/eWYC/8BH0AeGI/teh79HapMMshN3+vNK1G5sqrl/v5GiIxOpoiu1C+0fWvPbbBOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029674; c=relaxed/simple; bh=FmLUxGQFBwPe4AmYIR9hOcTDFnwbCTD47xrnTkEbT7o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=MWR34QX+05CVsh5JF/k1bOm/oFhPuNAnoMsm23VIfsANI2r9ScdGZ4xIOyMGqR5B6rYv9DaOLKPXqEQgXtpjHbZN7SY1KNc31OrL1P5tjHf8WHmo9iImy4BCBZ3RkSUm2zGrlCbk6M2j/H73rc6Qw3FaHpn9AA2TPzMvatTIwOU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=l3FGY4SK; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="l3FGY4SK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029673; x=1775565673; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FmLUxGQFBwPe4AmYIR9hOcTDFnwbCTD47xrnTkEbT7o=; b=l3FGY4SKk4I7oiHohPb2suyzGqYU6N9DNoeCJGdjPO9GIWzUEu/I4UDN vXsrTMwsKSVoXnkYYgCvtb+k22ZeV2c8XkG2QHWoNpHSMRHVq9ZwowGa5 JbjecJnzCplne9zVQb4oyl84pavvnokEA136h2AtFa6p8UayivKHTlVz/ WXFlrvJm6HmsFMjuZq6/lI/Cf6wleJ+S6o2f9LDXLKsuG58joD1Qlxbsq Vkjp+PdRAUN83vnWBv5V83D7h1QmYB+GEJgt5Byg968T3DrS4ZQbri17E xy8kAJTkJIiUmfz4mz4b/uJ70r9zYdG6lRCvJnjfWnYeFHRhTmkreDPcI w==; X-CSE-ConnectionGUID: +BbTD3zdTxyo2eL67Bv0iw== X-CSE-MsgGUID: rMO3CSPCQAeBkYaPfnbP5g== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779107" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779107" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:13 -0700 X-CSE-ConnectionGUID: UQdXABnaSBeBIwhfWWnBBw== X-CSE-MsgGUID: ybwIDg4BQDq0wNlGnnqU0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134283" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:11 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 18/20] ASoC: Intel: avs: boards: Change rt5663 card name Date: Mon, 7 Apr 2025 14:41:52 +0200 Message-Id: <20250407124154.1713039-19-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_rt5663" to "AVS I2S ALC5663". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/rt5663.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/rt5663.c b/sound/soc/intel/avs/boards/rt5663.c index e3310b3268baa..37aa2559a8e3c 100644 --- a/sound/soc/intel/avs/boards/rt5663.c +++ b/sound/soc/intel/avs/boards/rt5663.c @@ -198,6 +198,7 @@ static int avs_rt5663_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct rt5663_private *priv; struct device *dev = &pdev->dev; @@ -206,6 +207,7 @@ static int avs_rt5663_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -222,7 +224,12 @@ static int avs_rt5663_probe(struct platform_device *pdev) if (!priv || !card) return -ENOMEM; - card->name = "avs_rt5663"; + if (pdata->obsolete_card_names) { + card->name = "avs_rt5663"; + } else { + card->driver_name = "avs_rt5663"; + card->long_name = card->name = "AVS I2S ALC5640"; + } card->dev = dev; card->owner = THIS_MODULE; card->suspend_pre = avs_card_suspend_pre; From patchwork Mon Apr 7 12:41:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040436 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E42F024C098 for ; Mon, 7 Apr 2025 12:41:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029676; cv=none; b=j8S6j8okQ92PfkEqzarXFPG3kqAD0K2C4AMGfQzCcYD6gJ7SJ0+SQZaypwr9iR2UCf5jTBdCZ4B6OBkvLLuPkGt+DYFHPet8jria5crqZC7ghokWeJjTILGHSun8hI74DcJlSkZngIGYShPeWKst1e15NH+c5rce8ajGVtBoJ9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029676; c=relaxed/simple; bh=kzneauAwNqIg64NuvJT6lB+Gz1GA298g4J1ol8ybpSU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=FdxBN/PGFBsC6IzWmIIIO6JgLkQFQzf04vo3MPvm9kMl3sNlqnCO4iMFbRG81dA6xcrHfhDSDepCFjJAAlLsGKoEK6uwa1AgRVMD8RZftuVb7DEtCq8FOA3jWkGqUOCQ974h3cJAB8O1EJnqw4Fg061iZeLejvH5GyXJ674awbI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Qfyg8U4W; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Qfyg8U4W" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029675; x=1775565675; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kzneauAwNqIg64NuvJT6lB+Gz1GA298g4J1ol8ybpSU=; b=Qfyg8U4WLF0UpFqfCJNc7DyVfQC2wCI4QF/6GIp1dyJJh/u2bLdah2Kg 4h05YEhigBEatt/VJvrvoMYoBo0poL90qciYX9/ikx9WXdgJxePqtwGbs 17QZe82d3pGFCwDUlXb7SHurU414vcZ6izl6QFabuGJ/ZbQe8oaP5hvn6 EmZyZPCnrINIKO28vWzBG86ztUpGIKxoKWtLuR+5Jhh+wFNpnedPDt8XN xliYUSzVH3I+2dMXbak/E3L/jLvl5p4rj/k/FUpuSOFYA5rKdd5H5Ghmk /rZ+EQmVe9SZ6EMNVMQJ3JXRXzFjPVpyIlv/55E4tEyEiNEdhjUoGhNaN g==; X-CSE-ConnectionGUID: A8KTevR9S9alWMJnyVLnhw== X-CSE-MsgGUID: 2qMbszKKROOoTMaUCpPkSw== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779114" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779114" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:15 -0700 X-CSE-ConnectionGUID: gl/qr/xRRm2Tc3JaVmMwsQ== X-CSE-MsgGUID: Um3HjUrJScycTR+qlMkUkw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134293" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:13 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 19/20] ASoC: Intel: avs: boards: Change rt5682 card name Date: Mon, 7 Apr 2025 14:41:53 +0200 Message-Id: <20250407124154.1713039-20-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_rt5682" to "AVS I2S ALC5682". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/rt5682.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/rt5682.c b/sound/soc/intel/avs/boards/rt5682.c index 339df0b944c17..79e8d1084848e 100644 --- a/sound/soc/intel/avs/boards/rt5682.c +++ b/sound/soc/intel/avs/boards/rt5682.c @@ -268,6 +268,7 @@ static int avs_rt5682_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct snd_soc_jack *jack; struct device *dev = &pdev->dev; @@ -282,6 +283,7 @@ static int avs_rt5682_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -298,7 +300,12 @@ static int avs_rt5682_probe(struct platform_device *pdev) if (!jack || !card) return -ENOMEM; - card->name = "avs_rt5682"; + if (pdata->obsolete_card_names) { + card->name = "avs_rt5682"; + } else { + card->driver_name = "avs_rt5682"; + card->long_name = card->name = "AVS I2S ALC5682"; + } card->dev = dev; card->owner = THIS_MODULE; card->suspend_pre = avs_card_suspend_pre; From patchwork Mon Apr 7 12:41:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= X-Patchwork-Id: 14040437 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61023250BF1 for ; Mon, 7 Apr 2025 12:41:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029677; cv=none; b=Np6bRackC6cFho+eOZXmXUqG+GY7YmBrBtcs1BX+QdLOeO9Jg8D/ApEt/5bFrf6KJmcOVS2RS6oHbYmClkXegbcinpeVZ6PFjfikz/V9FntUx83FMXqqSbnE64JvOm3SVVzueIbM8Td01SCVjUfiXpXFgAn+f+glBcjJjLowubg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744029677; c=relaxed/simple; bh=p8FGbpZUN/wbuM8TDNnRLMZgxgVTDWDD2bAa/yOFHqM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=bkwpbmUYpATWkIfr8BvNtTyUxPPhv1oU7Yw2ymq3FvjDTQHj5p3R/3uNoBL0aaF2dsC5y7djRyhCSWsBoQ6593dDLjzfYnfp7WAzK4IXSNFBe3HLoLlWn27bCGj+i+TJ/Np7CZIg5pkSilhGhcT9c3Xb2Zs9E/tjy531SIjiYFc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=DNbF6hEH; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="DNbF6hEH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744029677; x=1775565677; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=p8FGbpZUN/wbuM8TDNnRLMZgxgVTDWDD2bAa/yOFHqM=; b=DNbF6hEH30jTw31gC++5Fip+eFnmN1xyKD7kudPtHJgxxQamudiadY4J /imk6n8e+J+jHVF+oWCkB2Q6XPXS7a5zglqW4Ftm2aAL8zh4wIwJuTjIj x7t5SUdbNICuvAtifrVkloymMB2FtIPjmGwJAiVgHxPjFeCGcayhncAEf l6qGSEWz1ij6Msn2IPgdPvBUK8l857mNuATGqLAKgOQVvSpw+6MhfwzV2 WupqbPg0eKAOZh/c5Lhg0zxxxWjXeiJ8eLcyJS7GnbCaqGi0jhnhmnUPE G25MAA6DcDmzN9hfsH73F0CCfyd6OMCE5ED3XGfn3HvqVvR3DVLZgRi1x A==; X-CSE-ConnectionGUID: IYYk6krgRe6nwZ0iOkdP9g== X-CSE-MsgGUID: HYWRX7jqT0qGl9wu7thcVA== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56779119" X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="56779119" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2025 05:41:16 -0700 X-CSE-ConnectionGUID: r/+7dsYUSh+Tgb7+cRaRCw== X-CSE-MsgGUID: rZjkaaxOTsKOuOOOtz7fKg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,194,1739865600"; d="scan'208";a="151134308" Received: from dev2.igk.intel.com ([10.237.148.94]) by fmviesa002.fm.intel.com with ESMTP; 07 Apr 2025 05:41:14 -0700 From: =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= To: Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: Cezary Rojewski , linux-sound@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= Subject: [PATCH 20/20] ASoC: Intel: avs: boards: Change ssm4567 card name Date: Mon, 7 Apr 2025 14:41:54 +0200 Message-Id: <20250407124154.1713039-21-amadeuszx.slawinski@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> References: <20250407124154.1713039-1-amadeuszx.slawinski@linux.intel.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Rename FE from "avs_ssm4567" to "AVS I2S SSM4567". Signed-off-by: Amadeusz Sławiński --- sound/soc/intel/avs/boards/ssm4567.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/avs/boards/ssm4567.c b/sound/soc/intel/avs/boards/ssm4567.c index 7667790d52739..2d11d39a9871e 100644 --- a/sound/soc/intel/avs/boards/ssm4567.c +++ b/sound/soc/intel/avs/boards/ssm4567.c @@ -132,6 +132,7 @@ static int avs_ssm4567_probe(struct platform_device *pdev) { struct snd_soc_dai_link *dai_link; struct snd_soc_acpi_mach *mach; + struct avs_mach_pdata *pdata; struct snd_soc_card *card; struct device *dev = &pdev->dev; const char *pname; @@ -139,6 +140,7 @@ static int avs_ssm4567_probe(struct platform_device *pdev) mach = dev_get_platdata(dev); pname = mach->mach_params.platform; + pdata = mach->pdata; ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot); if (ret) @@ -154,7 +156,12 @@ static int avs_ssm4567_probe(struct platform_device *pdev) if (!card) return -ENOMEM; - card->name = "avs_ssm4567"; + if (pdata->obsolete_card_names) { + card->name = "avs_ssm4567"; + } else { + card->driver_name = "avs_ssm4567"; + card->long_name = card->name = "AVS I2S SSM4567"; + } card->dev = dev; card->owner = THIS_MODULE; card->dai_link = dai_link;