Commit 3c561a09 authored by Brent Lu's avatar Brent Lu Committed by Mark Brown

ASoC: intel: sof_rt5682: update platform device name for Maxim amplifier

To follow 20-character length limitation of platform device name, we
have only 7 character space for amplifier. Therefore, the last
character of mx98357a and mx98360a is removed to save space.
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Fixes: e224ef76 ('ASoC: intel: sof_rt5682: support jsl_rt5682s_mx98360a board')
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210927143249.439129-1-brent.lu@intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent b689d81b
...@@ -959,7 +959,7 @@ static const struct platform_device_id board_ids[] = { ...@@ -959,7 +959,7 @@ static const struct platform_device_id board_ids[] = {
.name = "sof_rt5682", .name = "sof_rt5682",
}, },
{ {
.name = "tgl_mx98357a_rt5682", .name = "tgl_mx98357_rt5682",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_RT5682_SSP_CODEC(0) | SOF_RT5682_SSP_CODEC(0) |
SOF_SPEAKER_AMP_PRESENT | SOF_SPEAKER_AMP_PRESENT |
...@@ -989,7 +989,7 @@ static const struct platform_device_id board_ids[] = { ...@@ -989,7 +989,7 @@ static const struct platform_device_id board_ids[] = {
SOF_SSP_BT_OFFLOAD_PRESENT), SOF_SSP_BT_OFFLOAD_PRESENT),
}, },
{ {
.name = "jsl_rt5682_mx98360a", .name = "jsl_rt5682_mx98360",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_RT5682_MCLK_24MHZ | SOF_RT5682_MCLK_24MHZ |
SOF_RT5682_SSP_CODEC(0) | SOF_RT5682_SSP_CODEC(0) |
...@@ -1039,7 +1039,7 @@ static const struct platform_device_id board_ids[] = { ...@@ -1039,7 +1039,7 @@ static const struct platform_device_id board_ids[] = {
SOF_SSP_BT_OFFLOAD_PRESENT), SOF_SSP_BT_OFFLOAD_PRESENT),
}, },
{ {
.name = "adl_mx98357a_rt5682", .name = "adl_mx98357_rt5682",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_RT5682_SSP_CODEC(0) | SOF_RT5682_SSP_CODEC(0) |
SOF_SPEAKER_AMP_PRESENT | SOF_SPEAKER_AMP_PRESENT |
...@@ -1067,7 +1067,7 @@ static const struct platform_device_id board_ids[] = { ...@@ -1067,7 +1067,7 @@ static const struct platform_device_id board_ids[] = {
SOF_RT5682_SSP_AMP(1)), SOF_RT5682_SSP_AMP(1)),
}, },
{ {
.name = "jsl_rt5682s_mx98360a", .name = "jsl_rt5682s_mx98360",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_RT5682_MCLK_24MHZ | SOF_RT5682_MCLK_24MHZ |
SOF_RT5682_SSP_CODEC(0) | SOF_RT5682_SSP_CODEC(0) |
......
...@@ -291,7 +291,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { ...@@ -291,7 +291,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
}, },
{ {
.id = "10EC5682", .id = "10EC5682",
.drv_name = "adl_mx98357a_rt5682", .drv_name = "adl_mx98357_rt5682",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &adl_max98357a_amp, .quirk_data = &adl_max98357a_amp,
.sof_fw_filename = "sof-adl.ri", .sof_fw_filename = "sof-adl.ri",
......
...@@ -67,7 +67,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { ...@@ -67,7 +67,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
}, },
{ {
.id = "10EC5682", .id = "10EC5682",
.drv_name = "jsl_rt5682_mx98360a", .drv_name = "jsl_rt5682_mx98360",
.sof_fw_filename = "sof-jsl.ri", .sof_fw_filename = "sof-jsl.ri",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &mx98360a_spk, .quirk_data = &mx98360a_spk,
...@@ -99,7 +99,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { ...@@ -99,7 +99,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
}, },
{ {
.id = "RTL5682", .id = "RTL5682",
.drv_name = "jsl_rt5682s_mx98360a", .drv_name = "jsl_rt5682s_mx98360",
.sof_fw_filename = "sof-jsl.ri", .sof_fw_filename = "sof-jsl.ri",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &mx98360a_spk, .quirk_data = &mx98360a_spk,
......
...@@ -333,7 +333,7 @@ static const struct snd_soc_acpi_codecs tgl_rt1011_amp = { ...@@ -333,7 +333,7 @@ static const struct snd_soc_acpi_codecs tgl_rt1011_amp = {
struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = { struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
{ {
.id = "10EC5682", .id = "10EC5682",
.drv_name = "tgl_mx98357a_rt5682", .drv_name = "tgl_mx98357_rt5682",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &tgl_codecs, .quirk_data = &tgl_codecs,
.sof_fw_filename = "sof-tgl.ri", .sof_fw_filename = "sof-tgl.ri",
......
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