Commit 286345ee authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: dwc: Added a quirk DW_I2S_QUIRK_16BIT_IDX_OVERRIDE to dwc driver 



Added quirk DW_I2S_QUIRK_16BIT_IDX_OVERRIDE to Designware
driver. This quirk will set idx value to 1.

By setting this quirk, it will override supported format
as 16 bit resolution and bus width as 2 Bytes.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2ea659a9

include/sound/designware_i2s.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ struct i2s_platform_data { 




	#define DW_I2S_QUIRK_COMP_REG_OFFSET	(1 << 0)

	#define DW_I2S_QUIRK_COMP_REG_OFFSET	(1 << 0)

	#define DW_I2S_QUIRK_COMP_PARAM1	(1 << 1)

	#define DW_I2S_QUIRK_COMP_PARAM1	(1 << 1)

	#define DW_I2S_QUIRK_16BIT_IDX_OVERRIDE (1 << 2)

	unsigned int quirks;

	unsigned int quirks;

	unsigned int i2s_reg_comp1;

	unsigned int i2s_reg_comp1;

	unsigned int i2s_reg_comp2;

	unsigned int i2s_reg_comp2;

sound/soc/dwc/dwc-i2s.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -496,6 +496,8 @@ static int dw_configure_dai(struct dw_i2s_dev *dev, 
		idx = COMP1_TX_WORDSIZE_0(comp1);

		idx = COMP1_TX_WORDSIZE_0(comp1);

		if (WARN_ON(idx >= ARRAY_SIZE(formats)))

		if (WARN_ON(idx >= ARRAY_SIZE(formats)))

			return -EINVAL;

			return -EINVAL;

		if (dev->quirks & DW_I2S_QUIRK_16BIT_IDX_OVERRIDE)

			idx = 1;

		dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM;

		dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM;

		dw_i2s_dai->playback.channels_max =

		dw_i2s_dai->playback.channels_max =

				1 << (COMP1_TX_CHANNELS(comp1) + 1);

				1 << (COMP1_TX_CHANNELS(comp1) + 1);
@@ -508,6 +510,8 @@ static int dw_configure_dai(struct dw_i2s_dev *dev, 
		idx = COMP2_RX_WORDSIZE_0(comp2);

		idx = COMP2_RX_WORDSIZE_0(comp2);

		if (WARN_ON(idx >= ARRAY_SIZE(formats)))

		if (WARN_ON(idx >= ARRAY_SIZE(formats)))

			return -EINVAL;

			return -EINVAL;

		if (dev->quirks & DW_I2S_QUIRK_16BIT_IDX_OVERRIDE)

			idx = 1;

		dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM;

		dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM;

		dw_i2s_dai->capture.channels_max =

		dw_i2s_dai->capture.channels_max =

				1 << (COMP1_RX_CHANNELS(comp1) + 1);

				1 << (COMP1_RX_CHANNELS(comp1) + 1);
@@ -543,6 +547,8 @@ static int dw_configure_dai_by_pd(struct dw_i2s_dev *dev, 
	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	if (dev->quirks & DW_I2S_QUIRK_16BIT_IDX_OVERRIDE)

		idx = 1;

	/* Set DMA slaves info */

	/* Set DMA slaves info */

	dev->play_dma_data.pd.data = pdata->play_dma_data;

	dev->play_dma_data.pd.data = pdata->play_dma_data;

	dev->capture_dma_data.pd.data = pdata->capture_dma_data;

	dev->capture_dma_data.pd.data = pdata->capture_dma_data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE