Unverified Commit bd586a02 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: use inclusive language for SSP clocks 



We introduced provider/consumer terms, and CBP_CFP acronyms for codec
drivers, let's use them as well in SOF.

Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKeyon Jie <yang.jie@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220120231532.196926-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1dafede3

sound/soc/sof/intel/hda-loader.c

+3 −3
Original line number Diff line number Diff line
@@ -101,14 +101,14 @@ static int cl_dsp_init(struct snd_sof_dev *sdev, int stream_tag) 
		goto err;

	}



	/* DSP is powered up, set all SSPs to slave mode */

	/* DSP is powered up, set all SSPs to clock consumer/codec provider mode */

	for (i = 0; i < chip->ssp_count; i++) {

		snd_sof_dsp_update_bits_unlocked(sdev, HDA_DSP_BAR,

						 chip->ssp_base_offset

						 + i * SSP_DEV_MEM_SIZE

						 + SSP_SSC1_OFFSET,

						 SSP_SET_SLAVE,

						 SSP_SET_SLAVE);

						 SSP_SET_CBP_CFP,

						 SSP_SET_CBP_CFP);

	}



	/* step 2: purge FW request */

sound/soc/sof/intel/hda.h

+3 −3
Original line number Diff line number Diff line
@@ -383,9 +383,9 @@ 


/* SSP Registers */

#define SSP_SSC1_OFFSET		0x4

#define SSP_SET_SCLK_SLAVE	BIT(25)

#define SSP_SET_SFRM_SLAVE	BIT(24)

#define SSP_SET_SLAVE		(SSP_SET_SCLK_SLAVE | SSP_SET_SFRM_SLAVE)

#define SSP_SET_SCLK_CONSUMER	BIT(25)

#define SSP_SET_SFRM_CONSUMER	BIT(24)

#define SSP_SET_CBP_CFP		(SSP_SET_SCLK_CONSUMER | SSP_SET_SFRM_CONSUMER)



#define HDA_IDISP_ADDR		2

#define HDA_IDISP_CODEC(x) ((x) & BIT(HDA_IDISP_ADDR))