diff options
| author | Richard Fitzgerald <rf@opensource.cirrus.com> | 2025-09-09 12:30:36 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-09-09 12:42:07 +0100 |
| commit | 59255cfa4a0aa3484739ea58d67e02651424ffe3 (patch) | |
| tree | e5b1afcfcabace87313f4c1d3ea2b5b918999b99 | |
| parent | 267b9cdee522d03f95acf7c77de91056a4e004b3 (diff) | |
ASoC: cs35l56: Check for vendor-specific speaker ID value
Call cs_amp_get_vendor_spkid() to get use a vendor-specific speaker ID
value, if one exists.
The speaker ID is used to load an appropriate set of firmware files for the
speakers, and is usually read from a GPIO. Some manufacturers are instead
using a custom UEFI variable for the speaker ID.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Message-ID: <20250909113039.922065-4-rf@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/cs35l56-shared.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index 850fcf385996..95d018ecb953 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -1054,7 +1054,17 @@ int cs35l56_get_speaker_id(struct cs35l56_base *cs35l56_base) u32 speaker_id; int i, ret; - /* Attempt to read the speaker type from a device property first */ + /* Check for vendor-specific speaker ID method */ + ret = cs_amp_get_vendor_spkid(cs35l56_base->dev); + if (ret >= 0) { + dev_dbg(cs35l56_base->dev, "Vendor Speaker ID = %d\n", ret); + return ret; + } else if (ret != -ENOENT) { + dev_err(cs35l56_base->dev, "Error getting vendor Speaker ID: %d\n", ret); + return ret; + } + + /* Attempt to read the speaker type from a device property */ ret = device_property_read_u32(cs35l56_base->dev, "cirrus,speaker-id", &speaker_id); if (!ret) { dev_dbg(cs35l56_base->dev, "Speaker ID = %d\n", speaker_id); |