Commit 8e13caa2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.6-rc6' of... 

Merge tag 'asoc-fix-v6.6-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.6

A fairly large set of fixes here but all driver specific, the biggest
block is Johan's work shaking out issues with device setup and teardown
for the wcd938x driver which is a relatively large but clearly broken
down set of changes.

There is one core helper function added as part of a fix for wsa-macro.
parents c8c0a03e e8ecffd9

Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ properties: 
    description:

      Current at which the headset micbias sense clamp will engage, 0 to

      disable.

    enum: [ 0, 14, 23, 41, 50, 60, 68, 86, 95 ]

    enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ]

    default: 0



  cirrus,bias-ramp-ms:

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card); 


int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream,

			    struct snd_pcm_hw_params *params, struct snd_soc_dai *dai);

int snd_soc_dapm_widget_name_cmp(struct snd_soc_dapm_widget *widget, const char *s);



/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_card *card);

sound/soc/codecs/cs35l56.c

+7 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static void cs35l56_patch(struct cs35l56_private *cs35l56) 


	mutex_lock(&cs35l56->base.irq_lock);



	init_completion(&cs35l56->init_completion);

	reinit_completion(&cs35l56->init_completion);



	cs35l56->soft_resetting = true;

	cs35l56_system_reset(&cs35l56->base, !!cs35l56->sdw_peripheral);
@@ -1186,6 +1186,12 @@ int cs35l56_init(struct cs35l56_private *cs35l56) 
	/* Registers could be dirty after soft reset or SoundWire enumeration */

	regcache_sync(cs35l56->base.regmap);



	/* Set ASP1 DOUT to high-impedance when it is not transmitting audio data. */

	ret = regmap_set_bits(cs35l56->base.regmap, CS35L56_ASP1_CONTROL3,

			      CS35L56_ASP1_DOUT_HIZ_CTRL_MASK);

	if (ret)

		return dev_err_probe(cs35l56->base.dev, ret, "Failed to write ASP1_CONTROL3\n");



	cs35l56->base.init_done = true;

	complete(&cs35l56->init_completion);

sound/soc/codecs/cs42l42-sdw.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/gpio/consumer.h>

#include <linux/iopoll.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>

sound/soc/codecs/cs42l43-jack.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static const unsigned int cs42l43_accdet_db_ms[] = { 
static const unsigned int cs42l43_accdet_ramp_ms[] = { 10, 40, 90, 170 };



static const unsigned int cs42l43_accdet_bias_sense[] = {

	14, 23, 41, 50, 60, 68, 86, 95, 0,

	14, 24, 43, 52, 61, 71, 90, 99, 0,

};



static int cs42l43_find_index(struct cs42l43_codec *priv, const char * const prop,