Unverified Commit 2b384bcd authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_nau8825: remove sof_nau8825 board id 



Remove sof_nau8825 board id and use adl_nau8825_def instead since SSP
port assignment is the same.

Reviewed-by: default avatarBard Liao <yung-chuan.liao@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-21-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_nau8825.c

+1 −9
Original line number Diff line number Diff line
@@ -271,10 +271,10 @@ static int sof_audio_probe(struct platform_device *pdev) 
	case CODEC_RT1015P:

		sof_rt1015p_codec_conf(&sof_audio_card_nau8825);

		break;

	case CODEC_NONE:

	case CODEC_MAX98360A:

	case CODEC_NAU8318:

	case CODEC_RT1019P:

	case CODEC_NONE:

		/* no codec conf required */

		break;

	default:
@@ -297,14 +297,6 @@ static int sof_audio_probe(struct platform_device *pdev) 
}



static const struct platform_device_id board_ids[] = {

	{

		.name = "sof_nau8825",

		.driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(0) |

					SOF_NUM_IDISP_HDMI(4) |

					SOF_SSP_PORT_BT_OFFLOAD(2) |

					SOF_BT_OFFLOAD_PRESENT),



	},

	{

		.name = "adl_rt1019p_8825",

		.driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(0) |

sound/soc/intel/common/soc-acpi-intel-adl-match.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
	},

	{

		.id = "10508825",

		.drv_name = "sof_nau8825",

		.drv_name = "adl_nau8825_def",

		.sof_tplg_filename = "sof-adl-nau8825.tplg",

	},

	{