Unverified Commit 3c365027 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: soundwire: SDCA device quirk and cleanups" from... 

Merge series "ASoC: soundwire: SDCA device quirk and cleanups" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

Add one quirk to handle new TigerLake-SDCA device and cleanup code.

Pierre-Louis Bossart (4):
  ASoC: Intel: sof_sdw: add quirk for new TigerLake-SDCA device
  ASoC: codecs: rt*.c: remove useless pointer cast
  ASoC: rt711: remove warnings
  ASoC: codecs: max98373-sdw: align regmap use with other codecs

 sound/soc/codecs/max98373-sdw.c  |  2 +-
 sound/soc/codecs/rt1308-sdw.c    |  2 +-
 sound/soc/codecs/rt5682-sdw.c    |  2 +-
 sound/soc/codecs/rt700.c         |  2 +-
 sound/soc/codecs/rt711-sdw.c     | 15 ++++++++-------
 sound/soc/codecs/rt711.c         |  2 +-
 sound/soc/codecs/rt715.c         |  2 +-
 sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++
 8 files changed, 24 insertions(+), 13 deletions(-)

--
2.25.1
parents 76462eff f1848926

sound/soc/codecs/max98373-sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static __maybe_unused int max98373_suspend(struct device *dev) 
	struct max98373_priv *max98373 = dev_get_drvdata(dev);



	regcache_cache_only(max98373->regmap, true);

	regcache_mark_dirty(max98373->regmap);



	return 0;

}

sound/soc/codecs/rt1308-sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ static int rt1308_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
	if (!stream)

		return -ENOMEM;



	stream->sdw_stream = (struct sdw_stream_runtime *)sdw_stream;

	stream->sdw_stream = sdw_stream;



	/* Use tx_mask or rx_mask to configure stream tag and set dma_data */

	if (direction == SNDRV_PCM_STREAM_PLAYBACK)

sound/soc/codecs/rt5682-sdw.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int rt5682_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
	if (!stream)

		return -ENOMEM;



	stream->sdw_stream = (struct sdw_stream_runtime *)sdw_stream;

	stream->sdw_stream = sdw_stream;



	/* Use tx_mask or rx_mask to configure stream tag and set dma_data */

	if (direction == SNDRV_PCM_STREAM_PLAYBACK)

sound/soc/codecs/rt700.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ static int rt700_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream, 
	if (!stream)

		return -ENOMEM;



	stream->sdw_stream = (struct sdw_stream_runtime *)sdw_stream;

	stream->sdw_stream = sdw_stream;



	/* Use tx_mask or rx_mask to configure stream tag and set dma_data */

	if (direction == SNDRV_PCM_STREAM_PLAYBACK)

sound/soc/codecs/rt711-sdw.c

+8 −7
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ static int rt711_update_status(struct sdw_slave *slave, 
static int rt711_read_prop(struct sdw_slave *slave)

{

	struct sdw_slave_prop *prop = &slave->prop;

	int nval, i;

	int nval;

	int i, j;

	u32 bit;

	unsigned long addr;

	struct sdw_dpn_prop *dpn;
@@ -379,15 +380,15 @@ static int rt711_read_prop(struct sdw_slave *slave) 
	if (!prop->sink_dpn_prop)

		return -ENOMEM;



	i = 0;

	j = 0;

	dpn = prop->sink_dpn_prop;

	addr = prop->sink_ports;

	for_each_set_bit(bit, &addr, 32) {

		dpn[i].num = bit;

		dpn[i].type = SDW_DPN_FULL;

		dpn[i].simple_ch_prep_sm = true;

		dpn[i].ch_prep_timeout = 10;

		i++;

		dpn[j].num = bit;

		dpn[j].type = SDW_DPN_FULL;

		dpn[j].simple_ch_prep_sm = true;

		dpn[j].ch_prep_timeout = 10;

		j++;

	}



	/* set the timeout values */

CRA Git | Maintained and supported by SUSTech CRA and CCSE