Unverified Commit a41016e4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.2' of... 

Merge branch 'for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.3
parents 428306c3 df936613

sound/soc/codecs/ak4458.c

+11 −7
Original line number Diff line number Diff line
@@ -304,7 +304,10 @@ static int ak4458_rstn_control(struct snd_soc_component *component, int bit) 
					  AK4458_00_CONTROL1,

					  AK4458_RSTN_MASK,

					  0x0);

	if (ret < 0)

		return ret;



	return 0;

}



static int ak4458_hw_params(struct snd_pcm_substream *substream,
@@ -536,9 +539,10 @@ static void ak4458_power_on(struct ak4458_priv *ak4458) 
	}

}



static void ak4458_init(struct snd_soc_component *component)

static int ak4458_init(struct snd_soc_component *component)

{

	struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);

	int ret;



	/* External Mute ON */

	if (ak4458->mute_gpiod)
@@ -546,21 +550,21 @@ static void ak4458_init(struct snd_soc_component *component) 


	ak4458_power_on(ak4458);



	snd_soc_component_update_bits(component, AK4458_00_CONTROL1,

	ret = snd_soc_component_update_bits(component, AK4458_00_CONTROL1,

			    0x80, 0x80);   /* ACKS bit = 1; 10000000 */

	if (ret < 0)

		return ret;



	ak4458_rstn_control(component, 1);

	return ak4458_rstn_control(component, 1);

}



static int ak4458_probe(struct snd_soc_component *component)

{

	struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);



	ak4458_init(component);



	ak4458->fs = 48000;



	return 0;

	return ak4458_init(component);

}



static void ak4458_remove(struct snd_soc_component *component)

sound/soc/codecs/cs4265.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static const struct reg_default cs4265_reg_defaults[] = { 
static bool cs4265_readable_register(struct device *dev, unsigned int reg)

{

	switch (reg) {

	case CS4265_CHIP_ID ... CS4265_SPDIF_CTL2:

	case CS4265_CHIP_ID ... CS4265_MAX_REGISTER:

		return true;

	default:

		return false;

sound/soc/codecs/cs42xx8.c

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static int cs42xx8_runtime_resume(struct device *dev) 
	msleep(5);



	regcache_cache_only(cs42xx8->regmap, false);

	regcache_mark_dirty(cs42xx8->regmap);



	ret = regcache_sync(cs42xx8->regmap);

	if (ret) {

sound/soc/codecs/rt5677-spi.c

+3 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void rt5677_spi_reverse(u8 *dst, u32 dstlen, const u8 *src, u32 srclen) 
	u32 word_size = min_t(u32, dstlen, 8);



	for (w = 0; w < dstlen; w += word_size) {

		for (i = 0; i < word_size; i++) {

		for (i = 0; i < word_size && i + w < dstlen; i++) {

			si = w + word_size - i - 1;

			dst[w + i] = si < srclen ? src[si] : 0;

		}
@@ -154,8 +154,9 @@ int rt5677_spi_read(u32 addr, void *rxbuf, size_t len) 
		status |= spi_sync(g_spi, &m);

		mutex_unlock(&spi_mutex);





		/* Copy data back to caller buffer */

		rt5677_spi_reverse(cb + offset, t[1].len, body, t[1].len);

		rt5677_spi_reverse(cb + offset, len - offset, body, t[1].len);

	}

	return status;

}

sound/soc/fsl/fsl_asrc.c

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair) 
		return -EINVAL;

	}



	if ((outrate > 8000 && outrate < 30000) &&

	    (outrate/inrate > 24 || inrate/outrate > 8)) {

	if ((outrate >= 8000 && outrate <= 30000) &&

	    (outrate > 24 * inrate || inrate > 8 * outrate)) {

		pair_err("exceed supported ratio range [1/24, 8] for \

				inrate/outrate: %d/%d\n", inrate, outrate);

		return -EINVAL;