Commit b497654f authored by Brent Lu's avatar Brent Lu Committed by Mark Brown

ASoC: Intel: sof_rt5682: remove unnecessary idisp HDMI quirk

Remove SOF_NUM_IDISP_HDMI(3) from board quirks since the value is 3 if
not defined.
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240325221059.206042-19-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9ca54c33
...@@ -139,7 +139,6 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { ...@@ -139,7 +139,6 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
.driver_data = (void *)(SOF_RT5682_MCLK_EN | .driver_data = (void *)(SOF_RT5682_MCLK_EN |
SOF_SSP_PORT_CODEC(2) | SOF_SSP_PORT_CODEC(2) |
SOF_SSP_PORT_AMP(0) | SOF_SSP_PORT_AMP(0) |
SOF_NUM_IDISP_HDMI(3) |
SOF_SSP_PORT_BT_OFFLOAD(1) | SOF_SSP_PORT_BT_OFFLOAD(1) |
SOF_BT_OFFLOAD_PRESENT SOF_BT_OFFLOAD_PRESENT
), ),
...@@ -692,11 +691,11 @@ static int sof_audio_probe(struct platform_device *pdev) ...@@ -692,11 +691,11 @@ static int sof_audio_probe(struct platform_device *pdev)
case CODEC_RT1015P: case CODEC_RT1015P:
sof_rt1015p_codec_conf(&sof_audio_card_rt5682); sof_rt1015p_codec_conf(&sof_audio_card_rt5682);
break; break;
case CODEC_NONE:
case CODEC_MAX98357A: case CODEC_MAX98357A:
case CODEC_MAX98360A: case CODEC_MAX98360A:
case CODEC_RT1019P: case CODEC_RT1019P:
case CODEC_RT5650: case CODEC_RT5650:
case CODEC_NONE:
/* no codec conf required */ /* no codec conf required */
break; break;
default: default:
...@@ -763,7 +762,6 @@ static const struct platform_device_id board_ids[] = { ...@@ -763,7 +762,6 @@ static const struct platform_device_id board_ids[] = {
.name = "adl_rt5682_c1_h02", .name = "adl_rt5682_c1_h02",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_SSP_PORT_CODEC(1) | SOF_SSP_PORT_CODEC(1) |
SOF_NUM_IDISP_HDMI(3) |
/* SSP 0 and SSP 2 are used for HDMI IN */ /* SSP 0 and SSP 2 are used for HDMI IN */
SOF_SSP_MASK_HDMI_CAPTURE(0x5)), SOF_SSP_MASK_HDMI_CAPTURE(0x5)),
}, },
...@@ -787,7 +785,6 @@ static const struct platform_device_id board_ids[] = { ...@@ -787,7 +785,6 @@ static const struct platform_device_id board_ids[] = {
.name = "rpl_rt5682_c1_h02", .name = "rpl_rt5682_c1_h02",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_SSP_PORT_CODEC(1) | SOF_SSP_PORT_CODEC(1) |
SOF_NUM_IDISP_HDMI(3) |
/* SSP 0 and SSP 2 are used for HDMI IN */ /* SSP 0 and SSP 2 are used for HDMI IN */
SOF_SSP_MASK_HDMI_CAPTURE(0x5)), SOF_SSP_MASK_HDMI_CAPTURE(0x5)),
}, },
...@@ -796,7 +793,6 @@ static const struct platform_device_id board_ids[] = { ...@@ -796,7 +793,6 @@ static const struct platform_device_id board_ids[] = {
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_SSP_PORT_CODEC(0) | SOF_SSP_PORT_CODEC(0) |
SOF_SSP_PORT_AMP(1) | SOF_SSP_PORT_AMP(1) |
SOF_NUM_IDISP_HDMI(3) |
SOF_SSP_PORT_BT_OFFLOAD(2) | SOF_SSP_PORT_BT_OFFLOAD(2) |
SOF_BT_OFFLOAD_PRESENT), SOF_BT_OFFLOAD_PRESENT),
}, },
...@@ -804,15 +800,13 @@ static const struct platform_device_id board_ids[] = { ...@@ -804,15 +800,13 @@ static const struct platform_device_id board_ids[] = {
.name = "mtl_mx98360_rt5682", .name = "mtl_mx98360_rt5682",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_SSP_PORT_CODEC(0) | SOF_SSP_PORT_CODEC(0) |
SOF_SSP_PORT_AMP(1) | SOF_SSP_PORT_AMP(1)),
SOF_NUM_IDISP_HDMI(3)),
}, },
{ {
.name = "mtl_rt5682_def", .name = "mtl_rt5682_def",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_SSP_PORT_CODEC(2) | SOF_SSP_PORT_CODEC(2) |
SOF_SSP_PORT_AMP(0) | SOF_SSP_PORT_AMP(0) |
SOF_NUM_IDISP_HDMI(3) |
SOF_SSP_PORT_BT_OFFLOAD(1) | SOF_SSP_PORT_BT_OFFLOAD(1) |
SOF_BT_OFFLOAD_PRESENT), SOF_BT_OFFLOAD_PRESENT),
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment