Unverified Commit 5703ab86 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi: add is_device_rt712_vb() helper 



Add a filter to skip the RT172 VB configuration if a SmartMic Function
is not found in the SDCA descriptors.

If the ACPI information is incorrect this can only be quirked further
with DMI information.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20241016102333.294448-11-yung-chuan.liao@linux.intel.com


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

sound/soc/intel/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -71,9 +71,14 @@ if SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL 
config SND_SOC_ACPI_INTEL_MATCH

	tristate

	select SND_SOC_ACPI if ACPI

	select SND_SOC_ACPI_INTEL_SDCA_QUIRKS

	# this option controls the compilation of ACPI matching tables and

	# helpers and is not meant to be selected by the user.



config SND_SOC_ACPI_INTEL_SDCA_QUIRKS

	tristate

	imply SND_SOC_SDCA



endif ## SND_SOC_INTEL_SST_TOPLEVEL || SND_SOC_SOF_INTEL_TOPLEVEL



config SND_SOC_INTEL_KEEMBAY

sound/soc/intel/common/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -16,4 +16,7 @@ snd-soc-acpi-intel-match-y := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-matc 


snd-soc-acpi-intel-match-y += soc-acpi-intel-ssp-common.o



snd-soc-acpi-intel-sdca-quirks-y += soc-acpi-intel-sdca-quirks.o



obj-$(CONFIG_SND_SOC_ACPI_INTEL_MATCH) += snd-soc-acpi-intel-match.o

obj-$(CONFIG_SND_SOC_ACPI_INTEL_SDCA_QUIRKS) += snd-soc-acpi-intel-sdca-quirks.o

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

+51 −0
Original line number Diff line number Diff line
@@ -6,9 +6,12 @@ 
 *

 */



#include <linux/soundwire/sdw_intel.h>

#include <sound/sdca.h>

#include <sound/soc-acpi.h>

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

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

#include "soc-acpi-intel-sdca-quirks.h"

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



static const struct snd_soc_acpi_codecs mtl_rt5682_rt5682s_hp = {
@@ -133,6 +136,27 @@ static const struct snd_soc_acpi_endpoint rt712_endpoints[] = { 
	},

};



static const struct snd_soc_acpi_endpoint rt712_vb_endpoints[] = {

	{

		.num = 0,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{

		.num = 1,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{

		.num = 2,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

};



/*

 * RT722 is a multi-function codec, three endpoints are created for

 * its headset, amp and dmic functions.
@@ -190,6 +214,15 @@ static const struct snd_soc_acpi_adr_device rt712_0_single_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt712_vb_0_single_adr[] = {

	{

		.adr = 0x000030025D071201ull,

		.num_endpoints = ARRAY_SIZE(rt712_vb_endpoints),

		.endpoints = rt712_vb_endpoints,

		.name_prefix = "rt712"

	}

};



static const struct snd_soc_acpi_adr_device rt1712_3_single_adr[] = {

	{

		.adr = 0x000330025D171201ull,
@@ -363,6 +396,15 @@ static const struct snd_soc_acpi_link_adr mtl_712_l0[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr mtl_712_vb_l0[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt712_vb_0_single_adr),

		.adr_d = rt712_vb_0_single_adr,

	},

	{}

};



static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {

	{ /* Jack Playback Endpoint */

		.num = 0,
@@ -774,6 +816,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-mtl-rt712-l0-rt1712-l3.tplg",

	},

	{

		.link_mask = BIT(0),

		.links = mtl_712_vb_l0,

		.drv_name = "sof_sdw",

		.machine_check = snd_soc_acpi_intel_sdca_is_device_rt712_vb,

		.sof_tplg_filename = "sof-mtl-rt712-vb-l0.tplg",

	},

	{

		.link_mask = BIT(0),

		.links = mtl_712_l0,
@@ -843,3 +892,5 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { 
	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_sdw_machines);



MODULE_IMPORT_NS(SND_SOC_ACPI_INTEL_SDCA_QUIRKS);

sound/soc/intel/common/soc-acpi-intel-sdca-quirks.c

0 → 100644
+42 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * soc-acpi-intel-sdca-quirks.c - tables and support for SDCA quirks

 *

 * Copyright (c) 2024, Intel Corporation.

 *

 */



#include <linux/soundwire/sdw_intel.h>

#include <sound/sdca.h>

#include <sound/soc-acpi.h>

#include "soc-acpi-intel-sdca-quirks.h"



/*

 * Pretend machine quirk. The argument type is not the traditional

 * 'struct snd_soc_acpi_mach' pointer but instead the sdw_intel_ctx

 * which contains the peripheral information required for the

 * SoundWire/SDCA filter on the SMART_MIC setup and interface

 * revision. When the return value is false, the entry in the

 * 'snd_soc_acpi_mach' table needs to be skipped.

 */

bool snd_soc_acpi_intel_sdca_is_device_rt712_vb(void *arg)

{

	struct sdw_intel_ctx *ctx = arg;

	int i;



	if (!ctx)

		return false;



	for (i = 0; i < ctx->peripherals->num_peripherals; i++) {

		if (sdca_device_quirk_match(ctx->peripherals->array[i],

					    SDCA_QUIRKS_RT712_VB))

			return true;

	}



	return false;

}

EXPORT_SYMBOL_NS(snd_soc_acpi_intel_sdca_is_device_rt712_vb, SND_SOC_ACPI_INTEL_SDCA_QUIRKS);



MODULE_DESCRIPTION("ASoC ACPI Intel SDCA quirks");

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS(SND_SOC_SDCA);

sound/soc/intel/common/soc-acpi-intel-sdca-quirks.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * soc-acpi-intel-sdca-quirks.h - tables and support for SDCA quirks

 *

 * Copyright (c) 2024, Intel Corporation.

 *

 */



#ifndef _SND_SOC_ACPI_INTEL_SDCA_QUIRKS

#define _SND_SOC_ACPI_INTEL_SDCA_QUIRKS



bool snd_soc_acpi_intel_sdca_is_device_rt712_vb(void *arg);



#endif