From: Vitaly Rodionov <vitalyr@opensource.cirrus.com> To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Mark Brown <broonie@kernel.org> Cc: <alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>, <linux-kernel@vger.kernel.org>, Stefan Binding <sbinding@opensource.cirrus.com> Subject: [PATCH v3 05/17] ALSA: hda: cs35l41: Save Subsystem ID inside CS35L41 Driver Date: Thu, 19 May 2022 18:47:37 +0100 [thread overview] Message-ID: <20220519174749.15459-6-vitalyr@opensource.cirrus.com> (raw) In-Reply-To: <20220519174749.15459-1-vitalyr@opensource.cirrus.com> From: Stefan Binding <sbinding@opensource.cirrus.com> The Subsystem ID is read from the HDA driver, and will be used by the CS35L41 driver to be able to uniquely identify the laptop, which is required to be able to define firmware to be used by specific models. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com> --- Changes since v2: - No change sound/pci/hda/cs35l41_hda.c | 3 +++ sound/pci/hda/cs35l41_hda.h | 1 + sound/pci/hda/hda_component.h | 1 + sound/pci/hda/patch_realtek.c | 1 + 4 files changed, 6 insertions(+) diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index fe2ba03e602b..c235b899aa04 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -346,6 +346,9 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas return -EBUSY; comps->dev = dev; + if (!cs35l41->acpi_subsystem_id) + cs35l41->acpi_subsystem_id = devm_kasprintf(dev, GFP_KERNEL, + "%.8x", comps->subsystem_id); cs35l41->codec = comps->codec; strscpy(comps->name, dev_name(dev), sizeof(comps->name)); comps->playback_hook = cs35l41_hda_playback_hook; diff --git a/sound/pci/hda/cs35l41_hda.h b/sound/pci/hda/cs35l41_hda.h index 03c5f14631dd..b8352088a5cb 100644 --- a/sound/pci/hda/cs35l41_hda.h +++ b/sound/pci/hda/cs35l41_hda.h @@ -42,6 +42,7 @@ struct cs35l41_hda { int channel_index; unsigned volatile long irq_errors; const char *amp_name; + const char *acpi_subsystem_id; struct regmap_irq_chip_data *irq_data; bool firmware_running; bool halo_initialized; diff --git a/sound/pci/hda/hda_component.h b/sound/pci/hda/hda_component.h index 534e845b9cd1..fa6df52e7855 100644 --- a/sound/pci/hda/hda_component.h +++ b/sound/pci/hda/hda_component.h @@ -14,6 +14,7 @@ struct hda_component { struct device *dev; char name[HDA_MAX_NAME_SIZE]; + int subsystem_id; struct hda_codec *codec; void (*playback_hook)(struct device *dev, int action); }; diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 261b6ca6e85d..ef716f0b0052 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6629,6 +6629,7 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char if (!name) return; spec->comps[i].codec = cdc; + spec->comps[i].subsystem_id = cdc->core.subsystem_id; component_match_add(dev, &spec->match, component_compare_dev_name, name); } ret = component_master_add_with_match(dev, &comp_master_ops, spec->match); -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Vitaly Rodionov <vitalyr@opensource.cirrus.com> To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Mark Brown <broonie@kernel.org> Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Stefan Binding <sbinding@opensource.cirrus.com> Subject: [PATCH v3 05/17] ALSA: hda: cs35l41: Save Subsystem ID inside CS35L41 Driver Date: Thu, 19 May 2022 18:47:37 +0100 [thread overview] Message-ID: <20220519174749.15459-6-vitalyr@opensource.cirrus.com> (raw) In-Reply-To: <20220519174749.15459-1-vitalyr@opensource.cirrus.com> From: Stefan Binding <sbinding@opensource.cirrus.com> The Subsystem ID is read from the HDA driver, and will be used by the CS35L41 driver to be able to uniquely identify the laptop, which is required to be able to define firmware to be used by specific models. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com> --- Changes since v2: - No change sound/pci/hda/cs35l41_hda.c | 3 +++ sound/pci/hda/cs35l41_hda.h | 1 + sound/pci/hda/hda_component.h | 1 + sound/pci/hda/patch_realtek.c | 1 + 4 files changed, 6 insertions(+) diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index fe2ba03e602b..c235b899aa04 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -346,6 +346,9 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas return -EBUSY; comps->dev = dev; + if (!cs35l41->acpi_subsystem_id) + cs35l41->acpi_subsystem_id = devm_kasprintf(dev, GFP_KERNEL, + "%.8x", comps->subsystem_id); cs35l41->codec = comps->codec; strscpy(comps->name, dev_name(dev), sizeof(comps->name)); comps->playback_hook = cs35l41_hda_playback_hook; diff --git a/sound/pci/hda/cs35l41_hda.h b/sound/pci/hda/cs35l41_hda.h index 03c5f14631dd..b8352088a5cb 100644 --- a/sound/pci/hda/cs35l41_hda.h +++ b/sound/pci/hda/cs35l41_hda.h @@ -42,6 +42,7 @@ struct cs35l41_hda { int channel_index; unsigned volatile long irq_errors; const char *amp_name; + const char *acpi_subsystem_id; struct regmap_irq_chip_data *irq_data; bool firmware_running; bool halo_initialized; diff --git a/sound/pci/hda/hda_component.h b/sound/pci/hda/hda_component.h index 534e845b9cd1..fa6df52e7855 100644 --- a/sound/pci/hda/hda_component.h +++ b/sound/pci/hda/hda_component.h @@ -14,6 +14,7 @@ struct hda_component { struct device *dev; char name[HDA_MAX_NAME_SIZE]; + int subsystem_id; struct hda_codec *codec; void (*playback_hook)(struct device *dev, int action); }; diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 261b6ca6e85d..ef716f0b0052 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6629,6 +6629,7 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char if (!name) return; spec->comps[i].codec = cdc; + spec->comps[i].subsystem_id = cdc->core.subsystem_id; component_match_add(dev, &spec->match, component_compare_dev_name, name); } ret = component_master_add_with_match(dev, &comp_master_ops, spec->match); -- 2.34.1
next prev parent reply other threads:[~2022-05-19 17:49 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-19 17:47 [PATCH v3 00/17] ALSA: hda: cirrus: Add initial DSP support and firmware loading Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 01/17] ALSA: hda: hda_cs_dsp_ctl: Add Library to support CS_DSP ALSA controls Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-20 7:50 ` Takashi Iwai 2022-05-20 7:50 ` Takashi Iwai 2022-05-20 7:55 ` Takashi Iwai 2022-05-20 7:55 ` Takashi Iwai 2022-05-19 17:47 ` [PATCH v3 02/17] ALSA: hda: hda_cs_dsp_ctl: Add apis to write the controls directly Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 03/17] ALSA: hda: cs35l41: Save codec object inside component struct Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 04/17] ALSA: hda: cs35l41: Add initial DSP support and firmware loading Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-20 8:00 ` Takashi Iwai 2022-05-20 8:00 ` Takashi Iwai 2022-05-20 8:02 ` Takashi Iwai 2022-05-20 8:02 ` Takashi Iwai 2022-05-19 17:47 ` Vitaly Rodionov [this message] 2022-05-19 17:47 ` [PATCH v3 05/17] ALSA: hda: cs35l41: Save Subsystem ID inside CS35L41 Driver Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 06/17] ALSA: hda: cs35l41: Support reading subsystem id from ACPI Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 07/17] ALSA: hda: cs35l41: Support multiple load paths for firmware Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 08/17] ALSA: hda: cs35l41: Support Speaker ID for laptops Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 09/17] ASoC: cs35l41: Move cs35l41 exit hibernate function into shared code Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 10/17] ASoC: cs35l41: Do not print error when waking from hibernation Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 11/17] ASoC: cs35l41: Add common cs35l41 enter hibernate function Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 12/17] ALSA: hda: cs35l41: Support Hibernation during Suspend Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 13/17] ALSA: hda: cs35l41: Read Speaker Calibration data from UEFI variables Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 14/17] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 15/17] ALSA: hda: cs35l41: Add defaulted values into dsp bypass config sequence Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-19 17:47 ` [PATCH v3 16/17] ALSA: hda: cs35l41: Support Firmware switching and reloading Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-05-20 8:08 ` Takashi Iwai 2022-05-20 8:08 ` Takashi Iwai 2022-05-19 17:47 ` [PATCH v3 17/17] ALSA: hda: cs35l41: Add module parameter to control firmware load Vitaly Rodionov 2022-05-19 17:47 ` Vitaly Rodionov 2022-06-07 10:54 ` (subset) [PATCH v3 00/17] ALSA: hda: cirrus: Add initial DSP support and firmware loading Mark Brown 2022-06-07 10:54 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220519174749.15459-6-vitalyr@opensource.cirrus.com \ --to=vitalyr@opensource.cirrus.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=patches@opensource.cirrus.com \ --cc=perex@perex.cz \ --cc=sbinding@opensource.cirrus.com \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.