Unverified Commit e4926ca0 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: sof_rt5682: add supports for new 

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

Add HDMI-In support for MTL and rt5682 support for PTL.
parents 1a22f701 56d3705e

sound/soc/intel/boards/sof_rt5682.c

+15 −0
Original line number Diff line number Diff line
@@ -870,6 +870,13 @@ static const struct platform_device_id board_ids[] = { 
					SOF_SSP_PORT_BT_OFFLOAD(2) |

					SOF_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "mtl_rt5682_c1_h02",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_SSP_PORT_CODEC(1) |

					/* SSP 0 and SSP 2 are used for HDMI IN */

					SOF_SSP_MASK_HDMI_CAPTURE(0x5)),

	},

	{

		.name = "arl_rt5682_c1_h02",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
@@ -877,6 +884,14 @@ static const struct platform_device_id board_ids[] = { 
					/* SSP 0 and SSP 2 are used for HDMI IN */

					SOF_SSP_MASK_HDMI_CAPTURE(0x5)),

	},

	{

		.name = "ptl_rt5682_def",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_SSP_PORT_CODEC(0) |

					SOF_SSP_PORT_AMP(1) |

					SOF_SSP_PORT_BT_OFFLOAD(2) |

					SOF_BT_OFFLOAD_PRESENT),

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, board_ids);

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

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = { 
					SND_SOC_ACPI_TPLG_INTEL_SSP_MSB |

					SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,

	},

	{

		.comp_ids = &mtl_rt5682_rt5682s_hp,

		.drv_name = "mtl_rt5682_c1_h02",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &mtl_lt6911_hdmi,

		.sof_tplg_filename = "sof-mtl-rt5682-ssp1-hdmi-ssp02.tplg",

	},

	/* place boards for each headphone codec: sof driver will complete the

	 * tplg name and machine driver will detect the amp type

	 */

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

+13 −0
Original line number Diff line number Diff line
@@ -9,8 +9,21 @@ 
#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include "soc-acpi-intel-sdw-mockup-match.h"

#include <sound/soc-acpi-intel-ssp-common.h>



static const struct snd_soc_acpi_codecs ptl_rt5682_rt5682s_hp = {

	.num_codecs = 2,

	.codecs = {RT5682_ACPI_HID, RT5682S_ACPI_HID},

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[] = {

	{

		.comp_ids = &ptl_rt5682_rt5682s_hp,

		.drv_name = "ptl_rt5682_def",

		.sof_tplg_filename = "sof-ptl", /* the tplg suffix is added at run time */

		.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |

					SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_ptl_machines);