Commit f66229aa authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v5.17-2' of... 

Merge tag 'asoc-v5.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.17

A few more updates for v5.17, nothing hugely stand out in the few days
since the initial pull request was sent.
parents 2e88c6a8 f517ba49

drivers/firmware/cirrus/cs_dsp.c

+10 −4
Original line number Diff line number Diff line
@@ -2744,10 +2744,16 @@ EXPORT_SYMBOL_GPL(cs_dsp_stop); 


static int cs_dsp_halo_start_core(struct cs_dsp *dsp)

{

	return regmap_update_bits(dsp->regmap,

				  dsp->base + HALO_CCM_CORE_CONTROL,

	int ret;



	ret = regmap_update_bits(dsp->regmap, dsp->base + HALO_CCM_CORE_CONTROL,

				 HALO_CORE_RESET | HALO_CORE_EN,

				 HALO_CORE_RESET | HALO_CORE_EN);

	if (ret)

		return ret;



	return regmap_update_bits(dsp->regmap, dsp->base + HALO_CCM_CORE_CONTROL,

				  HALO_CORE_RESET, 0);

}



static void cs_dsp_halo_stop_core(struct cs_dsp *dsp)

include/sound/cs35l41.h

+7 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 
#define CS35L41_PROTECT_REL_ERR_IGN	0x00002034

#define CS35L41_GPIO_PAD_CONTROL	0x0000242C

#define CS35L41_JTAG_CONTROL		0x00002438

#define CS35L41_PWRMGT_CTL		0x00002900

#define CS35L41_WAKESRC_CTL		0x00002904

#define CS35L41_PWRMGT_STS		0x00002908

#define CS35L41_PLL_CLK_CTRL		0x00002C04

#define CS35L41_DSP_CLK_CTRL		0x00002C08

#define CS35L41_GLOBAL_CLK_CTRL		0x00002C0C
@@ -635,6 +638,8 @@ 
#define CS35L41_INPUT_DSP_TX1		0x32

#define CS35L41_INPUT_DSP_TX2		0x33



#define CS35L41_WR_PEND_STS_MASK	0x2



#define CS35L41_PLL_CLK_SEL_MASK	0x07

#define CS35L41_PLL_CLK_SEL_SHIFT	0

#define CS35L41_PLL_CLK_EN_MASK		0x10
@@ -762,6 +767,8 @@ struct cs35l41_otp_map_element_t { 
extern struct regmap_config cs35l41_regmap_i2c;

extern struct regmap_config cs35l41_regmap_spi;



int cs35l41_test_key_unlock(struct device *dev, struct regmap *regmap);

int cs35l41_test_key_lock(struct device *dev, struct regmap *regmap);

int cs35l41_otp_unpack(struct device *dev, struct regmap *regmap);

int cs35l41_register_errata_patch(struct device *dev, struct regmap *reg, unsigned int reg_revid);

int cs35l41_set_channels(struct device *dev, struct regmap *reg,

sound/soc/amd/acp/acp-mach-common.c

+4 −4
Original line number Diff line number Diff line
@@ -293,8 +293,8 @@ static const struct snd_soc_ops acp_card_rt5682s_ops = { 


/* Declare RT1019 codec components */

SND_SOC_DAILINK_DEF(rt1019,

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:01", "rt1019-aif"),

			  COMP_CODEC("i2c-10EC1019:02", "rt1019-aif")));

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:00", "rt1019-aif"),

			  COMP_CODEC("i2c-10EC1019:01", "rt1019-aif")));



static const struct snd_soc_dapm_route rt1019_map_lr[] = {

	{ "Left Spk", NULL, "Left SPO" },
@@ -303,11 +303,11 @@ static const struct snd_soc_dapm_route rt1019_map_lr[] = { 


static struct snd_soc_codec_conf rt1019_conf[] = {

	{

		 .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"),

		 .dlc = COMP_CODEC_CONF("i2c-10EC1019:00"),

		 .name_prefix = "Left",

	},

	{

		 .dlc = COMP_CODEC_CONF("i2c-10EC1019:02"),

		 .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"),

		 .name_prefix = "Right",

	},

};

sound/soc/codecs/ak4375.c

+0 −2
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ static int ak4375_power_on(struct ak4375_priv *ak4375) 
	return 0;

}



#ifdef CONFIG_PM

static int __maybe_unused ak4375_runtime_suspend(struct device *dev)

{

	struct ak4375_priv *ak4375 = dev_get_drvdata(dev);
@@ -463,7 +462,6 @@ static int __maybe_unused ak4375_runtime_resume(struct device *dev) 


	return regcache_sync(ak4375->regmap);

}

#endif /* CONFIG_PM */



static const struct snd_soc_component_driver soc_codec_dev_ak4375 = {

	.controls		= ak4375_snd_controls,

sound/soc/codecs/cs35l41-i2c.c

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
static const struct i2c_device_id cs35l41_id_i2c[] = {

	{ "cs35l40", 0 },

	{ "cs35l41", 0 },

	{ "cs35l51", 0 },

	{ "cs35l53", 0 },

	{}

};
@@ -84,6 +86,7 @@ MODULE_DEVICE_TABLE(acpi, cs35l41_acpi_match); 
static struct i2c_driver cs35l41_i2c_driver = {

	.driver = {

		.name		= "cs35l41",

		.pm		= &cs35l41_pm_ops,

		.of_match_table = of_match_ptr(cs35l41_of_match),

		.acpi_match_table = ACPI_PTR(cs35l41_acpi_match),

	},