From: Stefan Binding <sbinding@opensource.cirrus.com> To: "Rafael J . Wysocki" <rafael@kernel.org>, Len Brown <lenb@kernel.org>, Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com> Cc: <linux-acpi@vger.kernel.org>, <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>, <patches@opensource.cirrus.com>, Stefan Binding <sbinding@opensource.cirrus.com> Subject: [PATCH v3 2/2] ASoC: cs35l41: Read System Name from ACPI _SUB to identify firmware Date: Mon, 27 Jun 2022 16:51:38 +0100 [thread overview] Message-ID: <20220627155138.807420-3-sbinding@opensource.cirrus.com> (raw) In-Reply-To: <20220627155138.807420-1-sbinding@opensource.cirrus.com> When loading firmware, wm_adsp uses a number of parameters to determine the path of the firmware and tuning files to load. One of these parameters is system_name. Add support in cs35l41 to read this system name from the ACPI _SUB ID in order to uniquely identify the firmware and tuning mapped to a particular system. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> --- sound/soc/codecs/cs35l41.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index 8766e19d85f1..9ab016094b32 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -6,6 +6,7 @@ // // Author: David Rhodes <david.rhodes@cirrus.com> +#include <linux/acpi.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/init.h> @@ -1142,6 +1143,24 @@ static int cs35l41_dsp_init(struct cs35l41_private *cs35l41) return ret; } +static int cs35l41_probe_acpi(struct cs35l41_private *cs35l41) +{ + acpi_handle handle = ACPI_HANDLE(cs35l41->dev); + const char *sub; + + /* If there is no ACPI_HANDLE, there is no ACPI for this system, return 0 */ + if (!handle) + return 0; + + sub = acpi_get_subsystem_id(handle); + if (IS_ERR(sub)) + return PTR_ERR(sub); + + cs35l41->dsp.system_name = sub; + dev_dbg(cs35l41->dev, "Susystem ID: %s\n", cs35l41->dsp.system_name); + return 0; +} + int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *hw_cfg) { u32 regid, reg_revid, i, mtl_revid, int_status, chipid_match; @@ -1270,6 +1289,10 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg * goto err; } + ret = cs35l41_probe_acpi(cs35l41); + if (ret < 0) + goto err; + ret = cs35l41_dsp_init(cs35l41); if (ret < 0) goto err; @@ -1316,6 +1339,7 @@ void cs35l41_remove(struct cs35l41_private *cs35l41) pm_runtime_disable(cs35l41->dev); regmap_write(cs35l41->regmap, CS35L41_IRQ1_MASK1, 0xFFFFFFFF); + kfree(cs35l41->dsp.system_name); wm_adsp2_remove(&cs35l41->dsp); cs35l41_safe_reset(cs35l41->regmap, cs35l41->hw_cfg.bst_type); -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Stefan Binding <sbinding@opensource.cirrus.com> To: "Rafael J . Wysocki" <rafael@kernel.org>, Len Brown <lenb@kernel.org>, Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com> Cc: linux-acpi@vger.kernel.org, alsa-devel@alsa-project.org, Stefan Binding <sbinding@opensource.cirrus.com>, linux-kernel@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH v3 2/2] ASoC: cs35l41: Read System Name from ACPI _SUB to identify firmware Date: Mon, 27 Jun 2022 16:51:38 +0100 [thread overview] Message-ID: <20220627155138.807420-3-sbinding@opensource.cirrus.com> (raw) In-Reply-To: <20220627155138.807420-1-sbinding@opensource.cirrus.com> When loading firmware, wm_adsp uses a number of parameters to determine the path of the firmware and tuning files to load. One of these parameters is system_name. Add support in cs35l41 to read this system name from the ACPI _SUB ID in order to uniquely identify the firmware and tuning mapped to a particular system. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> --- sound/soc/codecs/cs35l41.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index 8766e19d85f1..9ab016094b32 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -6,6 +6,7 @@ // // Author: David Rhodes <david.rhodes@cirrus.com> +#include <linux/acpi.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/init.h> @@ -1142,6 +1143,24 @@ static int cs35l41_dsp_init(struct cs35l41_private *cs35l41) return ret; } +static int cs35l41_probe_acpi(struct cs35l41_private *cs35l41) +{ + acpi_handle handle = ACPI_HANDLE(cs35l41->dev); + const char *sub; + + /* If there is no ACPI_HANDLE, there is no ACPI for this system, return 0 */ + if (!handle) + return 0; + + sub = acpi_get_subsystem_id(handle); + if (IS_ERR(sub)) + return PTR_ERR(sub); + + cs35l41->dsp.system_name = sub; + dev_dbg(cs35l41->dev, "Susystem ID: %s\n", cs35l41->dsp.system_name); + return 0; +} + int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *hw_cfg) { u32 regid, reg_revid, i, mtl_revid, int_status, chipid_match; @@ -1270,6 +1289,10 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg * goto err; } + ret = cs35l41_probe_acpi(cs35l41); + if (ret < 0) + goto err; + ret = cs35l41_dsp_init(cs35l41); if (ret < 0) goto err; @@ -1316,6 +1339,7 @@ void cs35l41_remove(struct cs35l41_private *cs35l41) pm_runtime_disable(cs35l41->dev); regmap_write(cs35l41->regmap, CS35L41_IRQ1_MASK1, 0xFFFFFFFF); + kfree(cs35l41->dsp.system_name); wm_adsp2_remove(&cs35l41->dsp); cs35l41_safe_reset(cs35l41->regmap, cs35l41->hw_cfg.bst_type); -- 2.25.1
next prev parent reply other threads:[~2022-06-27 15:52 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-27 15:51 [PATCH v3 0/2] Read _SUB from ACPI to be able to identify firmware Stefan Binding 2022-06-27 15:51 ` Stefan Binding 2022-06-27 15:51 ` [PATCH v3 1/2] ACPI: utils: Add api to read _SUB from ACPI Stefan Binding 2022-06-27 15:51 ` Stefan Binding 2022-06-27 23:31 ` kernel test robot 2022-06-27 23:31 ` kernel test robot 2022-06-28 0:12 ` kernel test robot 2022-06-28 0:12 ` kernel test robot 2022-06-27 15:51 ` Stefan Binding [this message] 2022-06-27 15:51 ` [PATCH v3 2/2] ASoC: cs35l41: Read System Name from ACPI _SUB to identify firmware Stefan Binding
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=20220627155138.807420-3-sbinding@opensource.cirrus.com \ --to=sbinding@opensource.cirrus.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=lenb@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=patches@opensource.cirrus.com \ --cc=rafael@kernel.org \ /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.