Unverified Commit 13c459fa authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_nau8825: support rt1015p speaker amplifier 



Add rt1015p speaker amplifier support with a new board info
'adl_rt1015p_nau8825' which supports NAU8825 on SSP0 and ALC1015Q on
SSP1.

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://lore.kernel.org/r/20221117231919.112483-1-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_nau8825.c

+16 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#define SOF_RT1019P_SPEAKER_AMP_PRESENT	BIT(14)

#define SOF_MAX98373_SPEAKER_AMP_PRESENT	BIT(15)

#define SOF_MAX98360A_SPEAKER_AMP_PRESENT	BIT(16)

#define SOF_RT1015P_SPEAKER_AMP_PRESENT	BIT(17)



static unsigned long sof_nau8825_quirk = SOF_NAU8825_SSP_CODEC(0);
@@ -483,6 +484,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
		} else if (sof_nau8825_quirk &

				SOF_MAX98360A_SPEAKER_AMP_PRESENT) {

			max_98360a_dai_link(&links[id]);

		} else if (sof_nau8825_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT) {

			sof_rt1015p_dai_link(&links[id]);

		} else {

			goto devm_err;

		}
@@ -576,6 +579,8 @@ static int sof_audio_probe(struct platform_device *pdev) 


	if (sof_nau8825_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT)

		max_98373_set_codec_conf(&sof_audio_card_nau8825);

	else if (sof_nau8825_quirk & SOF_RT1015P_SPEAKER_AMP_PRESENT)

		sof_rt1015p_codec_conf(&sof_audio_card_nau8825);



	if (sof_nau8825_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)

		sof_audio_card_nau8825.num_links++;
@@ -642,6 +647,16 @@ static const struct platform_device_id board_ids[] = { 
					SOF_SSP_BT_OFFLOAD_PRESENT),



	},

	{

		.name = "adl_rt1015p_nau8825",

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

					SOF_SPEAKER_AMP_PRESENT |

					SOF_RT1015P_SPEAKER_AMP_PRESENT |

					SOF_NAU8825_SSP_AMP(1) |

					SOF_NAU8825_NUM_HDMIDEV(4) |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, board_ids);
@@ -663,3 +678,4 @@ MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>"); 
MODULE_LICENSE("GPL");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_REALTEK_COMMON);

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

+12 −0
Original line number Diff line number Diff line
@@ -430,6 +430,11 @@ static const struct snd_soc_acpi_codecs adl_rt5682_rt5682s_hp = { 
	.codecs = {"10EC5682", "RTL5682"},

};



static const struct snd_soc_acpi_codecs adl_rt1015p_amp = {

	.num_codecs = 1,

	.codecs = {"RTL1015"}

};



static const struct snd_soc_acpi_codecs adl_rt1019p_amp = {

	.num_codecs = 1,

	.codecs = {"RTL1019"}
@@ -495,6 +500,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.quirk_data = &adl_rt1019p_amp,

		.sof_tplg_filename = "sof-adl-rt1019-rt5682.tplg",

	},

	{

		.id = "10508825",

		.drv_name = "adl_rt1015p_nau8825",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_rt1015p_amp,

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

	},

	{

		.id = "10508825",

		.drv_name = "sof_nau8825",