kevin/linux
1
Fork 0
Code

ALSA/ASoC/SoundWire: Intel: use single definition for SDW_INTEL_MAX_LINKS

Browse Source 
The definitions are currently duplicated in intel-sdw-acpi.c and
sof_sdw.c.  Move the definition to the sdw_intel.h header, and change
the prefix to make it Intel-specific.

No functionality change in this patch.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240819005548.5867-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2024-08-19 08:55:46 +08:00 committed by Mark Brown
parent d08ea4193a
commit b27404b2bb
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/soundwire/sdw_intel.h
View File

@ -447,4 +447,9 @@ extern const struct sdw_intel_hw_ops sdw_intel_lnl_hw_ops;
#define SDW_INTEL_DEV_NUM_IDA_MIN 6
/*
* Max number of links supported in hardware
*/
#define SDW_INTEL_MAX_LINKS 4
#endif

5
sound/hda/intel-sdw-acpi.c
View File

@ -17,7 +17,6 @@
#include <linux/string.h>
#define SDW_LINK_TYPE 4 /* from Intel ACPI documentation */
#define SDW_MAX_LINKS 4
static int ctrl_link_mask;
module_param_named(sdw_link_mask, ctrl_link_mask, int, 0444);
@ -87,9 +86,9 @@ sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)
}
/* Check count is within bounds */
if (count > SDW_MAX_LINKS) {
if (count > SDW_INTEL_MAX_LINKS) {
dev_err(&adev->dev, "Link count %d exceeds max %d\n",
count, SDW_MAX_LINKS);
count, SDW_INTEL_MAX_LINKS);
return -EINVAL;
}

4
sound/soc/intel/boards/sof_sdw.c
View File

@ -5,12 +5,14 @@
* sof_sdw - ASOC Machine driver for Intel SoundWire platforms
*/
#include <linux/acpi.h>
#include <linux/bitmap.h>
#include <linux/device.h>
#include <linux/dmi.h>
#include <linux/module.h>
#include <linux/soundwire/sdw.h>
#include <linux/soundwire/sdw_type.h>
#include <linux/soundwire/sdw_intel.h>
#include <sound/soc-acpi.h>
#include "sof_sdw_common.h"
#include "../../codecs/rt711.h"
@ -883,7 +885,7 @@ static int create_sdw_dailinks(struct snd_soc_card *card,
struct intel_mc_ctx *intel_ctx = (struct intel_mc_ctx *)ctx->private;
int ret, i;
for (i = 0; i < SDW_MAX_LINKS; i++)
for (i = 0; i < SDW_INTEL_MAX_LINKS; i++)
intel_ctx->sdw_pin_index[i] = SOC_SDW_INTEL_BIDIR_PDI_BASE;
/* generate DAI links by each sdw link */

4
sound/soc/intel/boards/sof_sdw_common.h
View File

@ -19,8 +19,6 @@
#define SOC_SDW_MAX_CPU_DAIS 16
#define SOC_SDW_INTEL_BIDIR_PDI_BASE 2
#define SDW_MAX_LINKS 4
/* 8 combinations with 4 links + unused group 0 */
#define SDW_MAX_GROUPS 9
@ -57,7 +55,7 @@ enum {
struct intel_mc_ctx {
struct sof_hdmi_private hdmi;
/* To store SDW Pin index for each SoundWire link */
unsigned int sdw_pin_index[SDW_MAX_LINKS];
unsigned int sdw_pin_index[SDW_INTEL_MAX_LINKS];
};
extern unsigned long sof_sdw_quirk;

2
sound/soc/intel/boards/sof_sdw_hdmi.c
View File

@ -5,10 +5,12 @@
* sof_sdw_hdmi - Helpers to handle HDMI from generic machine driver
*/
#include <linux/acpi.h>
#include <linux/device.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/soundwire/sdw_intel.h>
#include <sound/soc.h>
#include <sound/soc-acpi.h>
#include <sound/jack.h>