July 2023 - Alsa-devel - mailman.alsa-project.org

[PATCH v1] slimbus: Use dev_err_probe instead of dev_err
by 王明-软件底层技术部 19 Jul '23

19 Jul '23

It is possible that dma_request_chan will return EPROBE_DEFER, which means that dev is not ready yet. In this case, dev_err(dev), there will be no output. This patch fixes the bug. Signed-off-by: Wang Ming <machel(a)vivo.com> --- drivers/slimbus/qcom-ngd-ctrl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 77aa6d26476c..d5c2a732f63f 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -679,8 +679,8 @@ static int qcom_slim_ngd_init_rx_msgq(struct qcom_slim_ngd_ctrl *ctrl) ctrl->dma_rx_channel = dma_request_chan(dev, "rx"); if (IS_ERR(ctrl->dma_rx_channel)) { - dev_err(dev, "Failed to request RX dma channel"); - ret = PTR_ERR(ctrl->dma_rx_channel); + ret = dev_err_probe(dev, PTR_ERR(ctrl->dma_rx_channel), + "Failed to request RX dma channel"); ctrl->dma_rx_channel = NULL; return ret; } @@ -717,8 +717,8 @@ static int qcom_slim_ngd_init_tx_msgq(struct qcom_slim_ngd_ctrl *ctrl) ctrl->dma_tx_channel = dma_request_chan(dev, "tx"); if (IS_ERR(ctrl->dma_tx_channel)) { - dev_err(dev, "Failed to request TX dma channel"); - ret = PTR_ERR(ctrl->dma_tx_channel); + ret = dev_err_probe(dev, PTR_ERR(ctrl->dma_tx_channel), + "Failed to request TX dma channel"); ctrl->dma_tx_channel = NULL; return ret; } -- 2.25.1

1 0

Correct Home For Documentation of ALSA's PCM State Machine
by Chas Leichner 19 Jul '23

19 Jul '23

Hi all, Several years ago, I went through the kernel and documented how ALSA API calls influence the PCM state. (https://source.chromium.org/chromium/chromium/src/+/main:chromecast/media/c…) One of my coworkers noted that this was still a useful document for their work, so I thought it might be worthwhile to put it somewhere a bit more discoverable than deep in the Chromium source tree, but I don't see an obvious spot from poking around the ALSA wiki. Do you have a suggested location for it? Thank you, Chas

1 0

[PATCH 00/48] ASoC: cirrus: Use the maple tree register cache
by Mark Brown 19 Jul '23

19 Jul '23

The maple tree register register cache is now able to generate multi register writes which was the last big feature of the rbtree cache that it didn't support so let's update drivers to use the cache with the more modern data structure. --- Mark Brown (48): ASoC: cs35l36: Update to use maple tree register cache ASoC: cs35l41: Update to use maple tree register cache ASoC: cs35l45: Update to use maple tree register cache ASoC: cs35l56: Update to use maple tree register cache ASoC: cs42l51: Update to use maple tree register cache ASoC: cs4265: Update to use maple tree register cache ASoC: cs4270: Update to use maple tree register cache ASoC: cs42l52: Update to use maple tree register cache ASoC: cs42l56: Update to use maple tree register cache ASoC: cs42xx8: Update to use maple tree register cache ASoC: cs4349: Update to use maple tree register cache ASoC: wm2200: Update to use maple tree register cache ASoC: wm5100: Update to use maple tree register cache ASoC: wm9081: Update to use maple tree register cache ASoC: wm9090: Update to use maple tree register cache ASoC: wm8510: Update to use maple tree register cache ASoC: wm8523: Update to use maple tree register cache ASoC: wm8580: Update to use maple tree register cache ASoC: wm8711: Update to use maple tree register cache ASoC: wm8728: Update to use maple tree register cache ASoC: wm8731: Update to use maple tree register cache ASoC: wm8737: Update to use maple tree register cache ASoC: wm8741: Update to use maple tree register cache ASoC: wm8750: Update to use maple tree register cache ASoC: wm8753: Update to use maple tree register cache ASoC: wm8770: Update to use maple tree register cache ASoC: wm8776: Update to use maple tree register cache ASoC: wm8804: Update to use maple tree register cache ASoC: wm8900: Update to use maple tree register cache ASoC: wm8903: Update to use maple tree register cache ASoC: wm8904: Update to use maple tree register cache ASoC: wm8960: Update to use maple tree register cache ASoC: wm8961: Update to use maple tree register cache ASoC: wm8962: Update to use maple tree register cache ASoC: wm8991: Update to use maple tree register cache ASoC: wm8993: Update to use maple tree register cache ASoC: wm8995: Update to use maple tree register cache ASoC: wm8996: Update to use maple tree register cache ASoC: wm8940: Update to use maple tree register cache ASoC: wm8955: Update to use maple tree register cache ASoC: wm8971: Update to use maple tree register cache ASoC: wm8978: Update to use maple tree register cache ASoC: wm8983: Update to use maple tree register cache ASoC: wm8985: Update to use maple tree register cache ASoC: wm8988: Update to use maple tree register cache ASoC: wm9705: Update to use maple tree register cache ASoC: wm9712: Update to use maple tree register cache ASoC: wm9713: Update to use maple tree register cache sound/soc/codecs/cs35l36.c | 2 +- sound/soc/codecs/cs35l41-lib.c | 4 ++-- sound/soc/codecs/cs35l45-tables.c | 4 ++-- sound/soc/codecs/cs35l56-shared.c | 6 +++--- sound/soc/codecs/cs4265.c | 2 +- sound/soc/codecs/cs4270.c | 2 +- sound/soc/codecs/cs42l51.c | 2 +- sound/soc/codecs/cs42l52.c | 2 +- sound/soc/codecs/cs42l56.c | 2 +- sound/soc/codecs/cs42xx8.c | 2 +- sound/soc/codecs/cs4349.c | 2 +- sound/soc/codecs/wm2200.c | 2 +- sound/soc/codecs/wm5100.c | 2 +- sound/soc/codecs/wm8510.c | 2 +- sound/soc/codecs/wm8523.c | 2 +- sound/soc/codecs/wm8580.c | 2 +- sound/soc/codecs/wm8711.c | 2 +- sound/soc/codecs/wm8728.c | 2 +- sound/soc/codecs/wm8731.c | 2 +- sound/soc/codecs/wm8737.c | 2 +- sound/soc/codecs/wm8741.c | 2 +- sound/soc/codecs/wm8750.c | 2 +- sound/soc/codecs/wm8753.c | 2 +- sound/soc/codecs/wm8770.c | 2 +- sound/soc/codecs/wm8776.c | 2 +- sound/soc/codecs/wm8804.c | 2 +- sound/soc/codecs/wm8900.c | 2 +- sound/soc/codecs/wm8903.c | 2 +- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8940.c | 2 +- sound/soc/codecs/wm8955.c | 2 +- sound/soc/codecs/wm8960.c | 2 +- sound/soc/codecs/wm8961.c | 2 +- sound/soc/codecs/wm8962.c | 2 +- sound/soc/codecs/wm8971.c | 2 +- sound/soc/codecs/wm8978.c | 2 +- sound/soc/codecs/wm8983.c | 2 +- sound/soc/codecs/wm8985.c | 2 +- sound/soc/codecs/wm8988.c | 2 +- sound/soc/codecs/wm8991.c | 2 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm8995.c | 2 +- sound/soc/codecs/wm8996.c | 2 +- sound/soc/codecs/wm9081.c | 2 +- sound/soc/codecs/wm9090.c | 2 +- sound/soc/codecs/wm9705.c | 2 +- sound/soc/codecs/wm9712.c | 2 +- sound/soc/codecs/wm9713.c | 2 +- 48 files changed, 52 insertions(+), 52 deletions(-) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230629-asoc-cirrus-maple-d3704cc6579f Best regards, -- Mark Brown <broonie(a)kernel.org>

2 51

[PATCH] ASoC: cs35l56: Patch soft registers to defaults
by Richard Fitzgerald 19 Jul '23

19 Jul '23

The soft (firmware) registers for volume/mute/posture are not reset by a chip soft-reset, so use a regmap patch to set them to defaults. cs35l56_reread_firmware_registers() has been removed. Its intent was to use whatever the firmware set as a default. But the driver now patches the defaults to the registers. Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- include/sound/cs35l56.h | 2 +- sound/soc/codecs/cs35l56-shared.c | 38 +++++++++++++------------------ sound/soc/codecs/cs35l56.c | 5 ++-- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h index 1f9713d7ca76..ec672daa36cf 100644 --- a/include/sound/cs35l56.h +++ b/include/sound/cs35l56.h @@ -260,7 +260,7 @@ extern const struct cs_dsp_region cs35l56_dsp1_regions[CS35L56_NUM_DSP_REGIONS]; extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC]; extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC]; -void cs35l56_reread_firmware_registers(struct device *dev, struct regmap *regmap); +int cs35l56_set_patch(struct regmap *regmap); int cs35l56_get_bclk_freq_id(unsigned int freq); void cs35l56_fill_supply_names(struct regulator_bulk_data *data); diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index 60da8c75b7b9..7126f06b8047 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -11,6 +11,19 @@ #include "cs35l56.h" +static const struct reg_sequence cs35l56_patch[] = { + /* These are not reset by a soft-reset, so patch to defaults. */ + { CS35L56_MAIN_RENDER_USER_MUTE, 0x00000000 }, + { CS35L56_MAIN_RENDER_USER_VOLUME, 0x00000000 }, + { CS35L56_MAIN_POSTURE_NUMBER, 0x00000000 }, +}; + +int cs35l56_set_patch(struct regmap *regmap) +{ + return regmap_register_patch(regmap, cs35l56_patch, ARRAY_SIZE(cs35l56_patch)); +} +EXPORT_SYMBOL_NS_GPL(cs35l56_set_patch, SND_SOC_CS35L56_SHARED); + static const struct reg_default cs35l56_reg_defaults[] = { { CS35L56_ASP1_ENABLES1, 0x00000000 }, { CS35L56_ASP1_CONTROL1, 0x00000028 }, @@ -35,9 +48,9 @@ static const struct reg_default cs35l56_reg_defaults[] = { { CS35L56_IRQ1_MASK_8, 0xfc000fff }, { CS35L56_IRQ1_MASK_18, 0x1f7df0ff }, { CS35L56_IRQ1_MASK_20, 0x15c00000 }, - /* CS35L56_MAIN_RENDER_USER_MUTE - soft register, no default */ - /* CS35L56_MAIN_RENDER_USER_VOLUME - soft register, no default */ - /* CS35L56_MAIN_POSTURE_NUMBER - soft register, no default */ + { CS35L56_MAIN_RENDER_USER_MUTE, 0x00000000 }, + { CS35L56_MAIN_RENDER_USER_VOLUME, 0x00000000 }, + { CS35L56_MAIN_POSTURE_NUMBER, 0x00000000 }, }; static bool cs35l56_is_dsp_memory(unsigned int reg) @@ -181,25 +194,6 @@ static bool cs35l56_volatile_reg(struct device *dev, unsigned int reg) } } -static const u32 cs35l56_firmware_registers[] = { - CS35L56_MAIN_RENDER_USER_MUTE, - CS35L56_MAIN_RENDER_USER_VOLUME, - CS35L56_MAIN_POSTURE_NUMBER, -}; - -void cs35l56_reread_firmware_registers(struct device *dev, struct regmap *regmap) -{ - int i; - unsigned int val; - - for (i = 0; i < ARRAY_SIZE(cs35l56_firmware_registers); i++) { - regmap_read(regmap, cs35l56_firmware_registers[i], &val); - dev_dbg(dev, "%s: %d: %#x: %#x\n", __func__, - i, cs35l56_firmware_registers[i], val); - } -} -EXPORT_SYMBOL_NS_GPL(cs35l56_reread_firmware_registers, SND_SOC_CS35L56_SHARED); - const struct cs_dsp_region cs35l56_dsp1_regions[] = { { .type = WMFW_HALO_PM_PACKED, .base = CS35L56_DSP1_PMEM_0 }, { .type = WMFW_HALO_XM_PACKED, .base = CS35L56_DSP1_XMEM_PACKED_0 }, diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c index c03f9d3c9a13..e046fdd26b74 100644 --- a/sound/soc/codecs/cs35l56.c +++ b/sound/soc/codecs/cs35l56.c @@ -1572,8 +1572,9 @@ int cs35l56_init(struct cs35l56_private *cs35l56) if (ret) return ret; - /* Populate soft registers in the regmap cache */ - cs35l56_reread_firmware_registers(cs35l56->dev, cs35l56->regmap); + ret = cs35l56_set_patch(cs35l56->regmap); + if (ret) + return ret; /* Registers could be dirty after soft reset or SoundWire enumeration */ regcache_sync(cs35l56->regmap); -- 2.30.2

2 1

[PATCH] ASoC: amd: acp: delete unnecessary NULL check
by Dan Carpenter 18 Jul '23

18 Jul '23

The list iterator can't be NULL. Delete the check and pull the code in one tab. Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- sound/soc/amd/acp/acp-rembrandt.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c index 21e67ed956d1..cc8284f417c0 100644 --- a/sound/soc/amd/acp/acp-rembrandt.c +++ b/sound/soc/amd/acp/acp-rembrandt.c @@ -266,18 +266,16 @@ static int __maybe_unused rmb_pcm_resume(struct device *dev) acp6x_master_clock_generate(dev); spin_lock(&adata->acp_lock); list_for_each_entry(stream, &adata->stream_list, list) { - if (stream) { - substream = stream->substream; - if (substream && substream->runtime) { - buf_in_frames = (substream->runtime->buffer_size); - buf_size = frames_to_bytes(substream->runtime, buf_in_frames); - config_pte_for_stream(adata, stream); - config_acp_dma(adata, stream, buf_size); - if (stream->dai_id) - restore_acp_i2s_params(substream, adata, stream); - else - restore_acp_pdm_params(substream, adata); - } + substream = stream->substream; + if (substream && substream->runtime) { + buf_in_frames = (substream->runtime->buffer_size); + buf_size = frames_to_bytes(substream->runtime, buf_in_frames); + config_pte_for_stream(adata, stream); + config_acp_dma(adata, stream, buf_size); + if (stream->dai_id) + restore_acp_i2s_params(substream, adata, stream); + else + restore_acp_pdm_params(substream, adata); } } spin_unlock(&adata->acp_lock); -- 2.39.2

2 1

[PATCH 00/11] mfd:: Update Cirrus Logic drivers to use maple tree register caches
by Mark Brown 18 Jul '23

18 Jul '23

With the v6.5 merge window the maple tree register cache has acquired the ability to generate multi-register writes during sync operations, removing the last major limitation it had compared to the rbtree cache. As part of a general modernisation effort update the Cirrus Logic drivers to use the more modern data structure, realistically there is likely to be very little user visible impact either way but generally the implementation choices of the maple tree cache should be a bit better on modern hardware. Signed-off-by: Mark --- Mark Brown (11): mfd: cs47l15: Update to use maple tree register cache mfd: cs47l24: Update to use maple tree register cache mfd: cs47l35: Update to use maple tree register cache mfd: cs47l85: Update to use maple tree register cache mfd: cs47l90: Update to use maple tree register cache mfd: cs47l92: Update to use maple tree register cache mfd: wm5102: Update to use maple tree register cache mfd: wm5110: Update to use maple tree register cache mfd: wm8994: Update to use maple tree register cache mfd: wm8997: Update to use maple tree register cache mfd: wm8998: Update to use maple tree register cache drivers/mfd/cs47l15-tables.c | 8 ++++---- drivers/mfd/cs47l24-tables.c | 2 +- drivers/mfd/cs47l35-tables.c | 8 ++++---- drivers/mfd/cs47l85-tables.c | 8 ++++---- drivers/mfd/cs47l90-tables.c | 8 ++++---- drivers/mfd/cs47l92-tables.c | 8 ++++---- drivers/mfd/wm5102-tables.c | 2 +- drivers/mfd/wm5110-tables.c | 2 +- drivers/mfd/wm8994-regmap.c | 6 +++--- drivers/mfd/wm8997-tables.c | 2 +- drivers/mfd/wm8998-tables.c | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230623-mfd-cirrus-maple-4b3286352baa Best regards, -- Mark Brown <broonie(a)kernel.org>

3 15

[PATCH] ALSA: hda/realtek: Add quirk for Clevo NS70AU
by Werner Sembach 18 Jul '23

18 Jul '23

From: Christoffer Sandberg <cs(a)tuxedo.de> Fixes headset detection on Clevo NS70AU. Co-developed-by: Werner Sembach <wse(a)tuxedocomputers.com> Signed-off-by: Werner Sembach <wse(a)tuxedocomputers.com> Signed-off-by: Christoffer Sandberg <cs(a)tuxedo.de> Cc: <stable(a)vger.kernel.org> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e2f8b608de82b..770b2953f0412 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9727,6 +9727,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x5157, "Clevo W517GU1", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x51a1, "Clevo NS50MU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x51b1, "Clevo NS50AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x51b3, "Clevo NS70AU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x5630, "Clevo NP50RNJS", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x70a1, "Clevo NB70T[HJK]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x70b3, "Clevo NK70SB", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), -- 2.34.1

2 1

X13s volume fixes
by GitHub pull_request - opened 18 Jul '23

18 Jul '23

alsa-project/alsa-ucm-conf pull request #335 was opened from Srinivas-Kandagatla: This patchset fixes some of the Volume issues that are seen on X13s, most of the existing ucm was controlling Digital Gains instead of Analog Gains. With this patchset the volume on both speakers are much better and not saturated. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/335 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/335.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v4 00/15] PCI: Define Intel PCI IDs and use them in drivers
by Amadeusz Sławiński 18 Jul '23

18 Jul '23

PCI IDs for Intel HDA are duplicated across quite a few drivers, due to various configurations and historical reasons. Currently almost all uses of HDA PCI IDs have corresponding comment telling which platform it is. Additionally there are some inconsistencies between drivers about which ID corresponds to which device. Simplify things, by adding PCI IDs to global header and make use of them in drivers. This allows for removal of comments by having IDs themselves being self explanatory. Additionally it allows for removal of existing inconsistencies by having one source of truth. Changes from v3: - Fix double space in commit message title (Ilpo) - Comment ACPI/PCI ID handling in Atom SST driver (Andy) - Rebased once again and used --base this time (Andy) Changes from v2: - Change CHV to BSW (Andy) - Fix incorrectly rebased patches (Andy) - Fix commit message and add suggestions from Andy to SST patch (Andy) - Rebased on top of Linus tree commit: 4b810bf037e5 Changes from v1: - Remove BXT-T PCI ID as it is not released (Andy) - Reorder macros to start from pci_match_id() (Andy) - Add comment about BXT->APL name change in commit messages (Andy) - Use SST as part of macro name for DSP only devices (Andy) - Add PCI IDs for all SST combinations (Andy) Changes from RFC: - Sort Intel PCI IDs before adding new ones - Fix ordering of new PCI IDs (Andy) - Define all used Intel IDs (Andy) - Add macros for controller type detection (Andy/Bjorn) - Add set of patches changing to use above macro (Andy/Bjorn) - Use PCI_DEVICE_DATA for Intel IDs in sound/pci/hda/hda_intel.c (Andy) - Commit message wording (Andy) - Remove unnecessary tabs (Andy) Amadeusz Sławiński (15): PCI: Sort Intel PCI IDs by number PCI: Add Intel Audio DSP devices to pci_ids.h ASoC: SOF: Remove unused Broxton PCI ID ALSA: Remove unused Broxton PCI ID ALSA: hda: Add controller matching macros ALSA: hda: Use global PCI match macro ALSA: hda/i915: Use global PCI match macro ASoC: Intel: Skylake: Use global PCI match macro ALSA: intel-dsp-config: Convert to PCI device IDs defines ALSA: hda: Convert to PCI device IDs defines ASoC: Intel: avs: Convert to PCI device IDs defines ASoC: Intel: avs: Convert to PCI device IDs defines ASoC: Intel: Skylake: Convert to PCI device IDs defines ASoC: SOF: Intel: Convert to PCI device IDs defines ASoC: Intel: sst: Convert to PCI device IDs defines include/linux/pci_ids.h | 105 +++++-- include/sound/hda_codec.h | 3 - include/sound/hdaudio.h | 26 ++ sound/hda/hdac_i915.c | 7 +- sound/hda/intel-dsp-config.c | 124 ++++---- sound/pci/hda/hda_intel.c | 373 ++++++++++--------------- sound/soc/intel/atom/sst/sst.c | 14 +- sound/soc/intel/atom/sst/sst.h | 7 +- sound/soc/intel/atom/sst/sst_pci.c | 4 +- sound/soc/intel/avs/board_selection.c | 10 +- sound/soc/intel/avs/core.c | 16 +- sound/soc/intel/skylake/skl-messages.c | 16 +- sound/soc/intel/skylake/skl-pcm.c | 3 +- sound/soc/intel/skylake/skl.c | 36 +-- sound/soc/sof/intel/pci-apl.c | 8 +- sound/soc/sof/intel/pci-cnl.c | 15 +- sound/soc/sof/intel/pci-icl.c | 12 +- sound/soc/sof/intel/pci-mtl.c | 3 +- sound/soc/sof/intel/pci-skl.c | 6 +- sound/soc/sof/intel/pci-tgl.c | 45 +-- sound/soc/sof/intel/pci-tng.c | 3 +- 21 files changed, 391 insertions(+), 445 deletions(-) base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c -- 2.34.1

3 20

[PATCH 1/1] ASoC: codec: wm8960: add additional probe check for codec identification
by Frank Li 18 Jul '23

18 Jul '23

The wm8960 codec is not readable, resulting in a NACK for address 0x3d (8-bit). This can partially indicate it. For example: wm8962 codec use the same address but is readable. This additional probe check will help prevent loading the wm8960 module incorrectly on wm8962 hardware. Signed-off-by: Frank Li <Frank.Li(a)nxp.com> --- sound/soc/codecs/wm8960.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 0d167238a369..783c85912c59 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -1415,6 +1415,7 @@ static int wm8960_i2c_probe(struct i2c_client *i2c) struct wm8960_data *pdata = dev_get_platdata(&i2c->dev); struct wm8960_priv *wm8960; int ret; + u8 val; wm8960 = devm_kzalloc(&i2c->dev, sizeof(struct wm8960_priv), GFP_KERNEL); @@ -1436,6 +1437,12 @@ static int wm8960_i2c_probe(struct i2c_client *i2c) else if (i2c->dev.of_node) wm8960_set_pdata_from_of(i2c, &wm8960->pdata); + ret = i2c_master_recv(i2c, &val, sizeof(val)); + if (ret >= 0) { + dev_err(&i2c->dev, "Not wm8960, wm8960 reg can not read by i2c\n"); + return -EINVAL; + } + ret = wm8960_reset(wm8960->regmap); if (ret != 0) { dev_err(&i2c->dev, "Failed to issue reset\n"); -- 2.34.1

3 2