Unverified Commit 5c10da43 authored by Gongjun Song's avatar Gongjun Song Committed by Mark Brown
Browse files

ASoC: Intel: sof_sdw: use common helpers for all Realtek amps 



sof_sdw_rt1308.c/sof_sdw_rt1316.c/sof_sdw_rt1318.c handle amp
in basically the same way, optimized and merged into one file.

Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarGongjun Song <gongjun.song@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20221206212507.359993-3-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o 
snd-soc-ehl-rt5660-objs := ehl_rt5660.o

snd-soc-sof-ssp-amp-objs := sof_ssp_amp.o

snd-soc-sof-sdw-objs += sof_sdw.o				\

			sof_sdw_max98373.o sof_sdw_rt1308.o	\

			sof_sdw_rt1316.o sof_sdw_rt1318.o	\

			sof_sdw_max98373.o sof_sdw_rt_amp.o	\

			sof_sdw_rt5682.o sof_sdw_rt700.o	\

			sof_sdw_rt711.o sof_sdw_rt711_sdca.o 	\

			sof_sdw_rt715.o	sof_sdw_rt715_sdca.o 	\

sound/soc/intel/boards/sof_sdw.c

+5 −5
Original line number Diff line number Diff line
@@ -550,23 +550,23 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
		.direction = {true, false},

		.dai_name = "rt1308-aif",

		.ops = &sof_sdw_rt1308_i2s_ops,

		.init = sof_sdw_rt1308_init,

		.exit = sof_sdw_rt1308_exit,

		.init = sof_sdw_rt_amp_init,

		.exit = sof_sdw_rt_amp_exit,

		.codec_type = SOF_SDW_CODEC_TYPE_AMP,

	},

	{

		.part_id = 0x1316,

		.direction = {true, true},

		.dai_name = "rt1316-aif",

		.init = sof_sdw_rt1316_init,

		.exit = sof_sdw_rt1316_exit,

		.init = sof_sdw_rt_amp_init,

		.exit = sof_sdw_rt_amp_exit,

		.codec_type = SOF_SDW_CODEC_TYPE_AMP,

	},

	{

		.part_id = 0x1318,

		.direction = {true, true},

		.dai_name = "rt1318-aif",

		.init = sof_sdw_rt1318_init,

		.init = sof_sdw_rt_amp_init,

		.codec_type = SOF_SDW_CODEC_TYPE_AMP,

	},

	{

sound/soc/intel/boards/sof_sdw_common.h

+4 −16
Original line number Diff line number Diff line
@@ -125,30 +125,18 @@ int sof_sdw_rt700_init(struct snd_soc_card *card, 
		       struct sof_sdw_codec_info *info,

		       bool playback);



/* RT1308 support */

/* RT1308 I2S support */

extern struct snd_soc_ops sof_sdw_rt1308_i2s_ops;



int sof_sdw_rt1308_init(struct snd_soc_card *card,

/* generic amp support */

int sof_sdw_rt_amp_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);

int sof_sdw_rt1308_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);

int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* RT1316 support */

int sof_sdw_rt1316_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);

int sof_sdw_rt1316_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* RT1318 support */

int sof_sdw_rt1318_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);



/* RT715 support */

int sof_sdw_rt715_init(struct snd_soc_card *card,

sound/soc/intel/boards/sof_sdw_rt1316.c

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

// Copyright (c) 2020 Intel Corporation



/*

 *  sof_sdw_rt1316 - Helpers to handle RT1316 from generic machine driver

 */



#include <linux/device.h>

#include <linux/errno.h>

#include <sound/control.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <sound/soc-dapm.h>

#include <linux/soundwire/sdw.h>

#include <linux/soundwire/sdw_type.h>

#include <linux/dmi.h>

#include "sof_sdw_common.h"

#include "sof_sdw_amp_coeff_tables.h"



struct rt1316_platform_data {

	const unsigned char *bq_params;

	const unsigned int bq_params_cnt;

};



static const struct rt1316_platform_data dell_0b00_platform_data = {

	.bq_params = dell_0b00_bq_params,

	.bq_params_cnt = ARRAY_SIZE(dell_0b00_bq_params),

};



static const struct dmi_system_id dmi_platform_data[] = {

	/* AlderLake devices */

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B00")

		},

		.driver_data = (void *)&dell_0b00_platform_data,

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0B01")

		},

		.driver_data = (void *)&dell_0b00_platform_data,

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0AFF")

		},

		.driver_data = (void *)&dell_0b00_platform_data,

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0AFE")

		},

		.driver_data = (void *)&dell_0b00_platform_data,

	},

};



static int rt1316_add_device_props(struct device *sdw_dev)

{

	struct property_entry props[3] = {};

	struct fwnode_handle *fwnode;

	const struct dmi_system_id *dmi_data;

	const struct rt1316_platform_data *pdata;

	unsigned char params[RT1316_MAX_BQ_REG];

	int ret;



	dmi_data = dmi_first_match(dmi_platform_data);

	if (!dmi_data)

		return 0;



	pdata = dmi_data->driver_data;

	memcpy(&params, pdata->bq_params, sizeof(unsigned char) * pdata->bq_params_cnt);



	props[0] = PROPERTY_ENTRY_U8_ARRAY("realtek,bq-params", params);

	props[1] = PROPERTY_ENTRY_U32("realtek,bq-params-cnt", pdata->bq_params_cnt);



	fwnode = fwnode_create_software_node(props, NULL);

	if (IS_ERR(fwnode))

		return PTR_ERR(fwnode);



	ret = device_add_software_node(sdw_dev, to_software_node(fwnode));



	fwnode_handle_put(fwnode);



	return ret;

}



static const struct snd_soc_dapm_widget rt1316_widgets[] = {

	SND_SOC_DAPM_SPK("Speaker", NULL),

};



/*

 * dapm routes for rt1316 will be registered dynamically according

 * to the number of rt1316 used. The first two entries will be registered

 * for one codec case, and the last two entries are also registered

 * if two 1316s are used.

 */

static const struct snd_soc_dapm_route rt1316_map[] = {

	{ "Speaker", NULL, "rt1316-1 SPOL" },

	{ "Speaker", NULL, "rt1316-1 SPOR" },

	{ "Speaker", NULL, "rt1316-2 SPOL" },

	{ "Speaker", NULL, "rt1316-2 SPOR" },

};



static const struct snd_kcontrol_new rt1316_controls[] = {

	SOC_DAPM_PIN_SWITCH("Speaker"),

};



static int first_spk_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



	card->components = devm_kasprintf(card->dev, GFP_KERNEL,

					  "%s spk:rt1316",

					  card->components);

	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_add_card_controls(card, rt1316_controls,

					ARRAY_SIZE(rt1316_controls));

	if (ret) {

		dev_err(card->dev, "rt1316 controls addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_new_controls(&card->dapm, rt1316_widgets,

					ARRAY_SIZE(rt1316_widgets));

	if (ret) {

		dev_err(card->dev, "rt1316 widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, rt1316_map, 2);

	if (ret)

		dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret);



	return ret;

}



static int second_spk_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



	ret = snd_soc_dapm_add_routes(&card->dapm, rt1316_map + 2, 2);

	if (ret)

		dev_err(rtd->dev, "failed to add second SPK map: %d\n", ret);



	return ret;

}



static int all_spk_init(struct snd_soc_pcm_runtime *rtd)

{

	int ret;



	ret = first_spk_init(rtd);

	if (ret)

		return ret;



	return second_spk_init(rtd);

}



int sof_sdw_rt1316_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)

{

	struct mc_private *ctx = snd_soc_card_get_drvdata(card);



	if (ctx->amp_dev1) {

		device_remove_software_node(ctx->amp_dev1);

		put_device(ctx->amp_dev1);

	}



	if (ctx->amp_dev2) {

		device_remove_software_node(ctx->amp_dev2);

		put_device(ctx->amp_dev2);

	}



	return 0;

}



int sof_sdw_rt1316_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback)

{

	struct mc_private *ctx = snd_soc_card_get_drvdata(card);

	struct device *sdw_dev1, *sdw_dev2;

	int ret;



	/* Count amp number and do init on playback link only. */

	if (!playback)

		return 0;



	info->amp_num++;

	if (info->amp_num == 1)

		dai_links->init = first_spk_init;



	if (info->amp_num == 2) {

		sdw_dev1 = bus_find_device_by_name(&sdw_bus_type, NULL, dai_links->codecs[0].name);

		if (!sdw_dev1)

			return -EPROBE_DEFER;



		ret = rt1316_add_device_props(sdw_dev1);

		if (ret < 0) {

			put_device(sdw_dev1);

			return ret;

		}

		ctx->amp_dev1 = sdw_dev1;



		sdw_dev2 = bus_find_device_by_name(&sdw_bus_type, NULL, dai_links->codecs[1].name);

		if (!sdw_dev2)

			return -EPROBE_DEFER;



		ret = rt1316_add_device_props(sdw_dev2);

		if (ret < 0) {

			put_device(sdw_dev2);

			return ret;

		}

		ctx->amp_dev2 = sdw_dev2;



		/*

		 * if two 1316s are in one dai link, the init function

		 * in this dai link will be first set for the first speaker,

		 * and it should be reset to initialize all speakers when

		 * the second speaker is found.

		 */

		if (dai_links->init)

			dai_links->init = all_spk_init;

		else

			dai_links->init = second_spk_init;

	}



	return 0;

}

sound/soc/intel/boards/sof_sdw_rt1318.c

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

// Copyright (c) 2022 Intel Corporation



/*

 *  sof_sdw_rt1318 - Helpers to handle RT1318 from generic machine driver

 */



#include <linux/device.h>

#include <linux/errno.h>

#include <sound/control.h>

#include <sound/soc.h>

#include <sound/soc-acpi.h>

#include <sound/soc-dapm.h>

#include "sof_sdw_common.h"



static const struct snd_soc_dapm_widget rt1318_widgets[] = {

	SND_SOC_DAPM_SPK("Speaker", NULL),

};



/*

 * dapm routes for rt1318 will be registered dynamically according

 * to the number of rt1318 used. The first two entries will be registered

 * for one codec case, and the last two entries are also registered

 * if two 1318s are used.

 */

static const struct snd_soc_dapm_route rt1318_map[] = {

	{ "Speaker", NULL, "rt1318-1 SPOL" },

	{ "Speaker", NULL, "rt1318-1 SPOR" },

	{ "Speaker", NULL, "rt1318-2 SPOL" },

	{ "Speaker", NULL, "rt1318-2 SPOR" },

};



static const struct snd_kcontrol_new rt1318_controls[] = {

	SOC_DAPM_PIN_SWITCH("Speaker"),

};



static int first_spk_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



	card->components = devm_kasprintf(card->dev, GFP_KERNEL,

					  "%s spk:rt1318",

					  card->components);

	if (!card->components)

		return -ENOMEM;



	ret = snd_soc_add_card_controls(card, rt1318_controls,

					ARRAY_SIZE(rt1318_controls));

	if (ret) {

		dev_err(card->dev, "rt1318 controls addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_new_controls(&card->dapm, rt1318_widgets,

					ARRAY_SIZE(rt1318_widgets));

	if (ret) {

		dev_err(card->dev, "rt1318 widgets addition failed: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, rt1318_map, 2);

	if (ret)

		dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret);



	return ret;

}



static int second_spk_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	int ret;



	ret = snd_soc_dapm_add_routes(&card->dapm, rt1318_map + 2, 2);

	if (ret)

		dev_err(rtd->dev, "failed to add second SPK map: %d\n", ret);



	return ret;

}



static int all_spk_init(struct snd_soc_pcm_runtime *rtd)

{

	int ret;



	ret = first_spk_init(rtd);

	if (ret)

		return ret;



	return second_spk_init(rtd);

}



int sof_sdw_rt1318_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback)

{

	/* Count amp number and do init on playback link only. */

	if (!playback)

		return 0;



	info->amp_num++;

	if (info->amp_num == 1)

		dai_links->init = first_spk_init;



	if (info->amp_num == 2) {

		/*

		 * if two 1318s are in one dai link, the init function

		 * in this dai link will be first set for the first speaker,

		 * and it should be reset to initialize all speakers when

		 * the second speaker is found.

		 */

		if (dai_links->init)

			dai_links->init = all_spk_init;

		else

			dai_links->init = second_spk_init;

	}



	return 0;

}