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

ASoC: Intel: sof_da7219: add glk_da7219_def for glk boards 



Add the board config glk_da7219_def to da7219 machine driver for all
glk boards using default SSP port allocation (headphone codec on SSP2,
speaker amplifiers 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/20240426152529.38345-12-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_da7219.c

+25 −4
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ 
#include "sof_maxim_common.h"



/* Driver-specific board quirks: from bit 0 to 7 */

#define SOF_DA7219_CML_BOARD			BIT(0)

#define SOF_DA7219_JSL_BOARD			BIT(1)

#define SOF_DA7219_MCLK_EN			BIT(2)

#define SOF_DA7219_GLK_BOARD			BIT(0)

#define SOF_DA7219_CML_BOARD			BIT(1)

#define SOF_DA7219_JSL_BOARD			BIT(2)

#define SOF_DA7219_MCLK_EN			BIT(3)



#define DIALOG_CODEC_DAI	"da7219-hifi"
@@ -296,6 +297,14 @@ sof_card_dai_links_create(struct device *dev, struct snd_soc_card *card, 
	return 0;

}



#define GLK_LINK_ORDER	SOF_LINK_ORDER(SOF_LINK_AMP,         \

					SOF_LINK_CODEC,      \

					SOF_LINK_DMIC01,     \

					SOF_LINK_IDISP_HDMI, \

					SOF_LINK_NONE,       \

					SOF_LINK_NONE,       \

					SOF_LINK_NONE)



#define CML_LINK_ORDER	SOF_LINK_ORDER(SOF_LINK_AMP,         \

					SOF_LINK_CODEC,      \

					SOF_LINK_DMIC01,     \
@@ -333,7 +342,13 @@ static int audio_probe(struct platform_device *pdev) 
	if (mach->mach_params.codec_mask & IDISP_CODEC_MASK)

		ctx->hdmi.idisp_codec = true;



	if (board_quirk & SOF_DA7219_CML_BOARD) {

	if (board_quirk & SOF_DA7219_GLK_BOARD) {

		/* dmic16k not support */

		ctx->dmic_be_num = 1;



		/* overwrite the DAI link order for GLK boards */

		ctx->link_order_overwrite = GLK_LINK_ORDER;

	} else if (board_quirk & SOF_DA7219_CML_BOARD) {

		/* overwrite the DAI link order for CML boards */

		ctx->link_order_overwrite = CML_LINK_ORDER;
@@ -427,6 +442,12 @@ static int audio_probe(struct platform_device *pdev) 
}



static const struct platform_device_id board_ids[] = {

	{

		.name = "glk_da7219_def",

		.driver_data = (kernel_ulong_t)(SOF_DA7219_GLK_BOARD |

					SOF_SSP_PORT_CODEC(2) |

					SOF_SSP_PORT_AMP(1)),

	},

	{

		.name = "cml_da7219_def",

		.driver_data = (kernel_ulong_t)(SOF_DA7219_CML_BOARD |