Skip to content

refine sdw_rt711_rt1308_rt715 #1796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 3 commits into from
Feb 19, 2020
Merged

refine sdw_rt711_rt1308_rt715 #1796

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b551252
ASoC: Intel: sdw_rt711_rt1308_rt715: refine HDMI support
RanderWang Feb 16, 2020
6f627a7
ASoC: Intel: sdw_rt711_rt1308_rt715: fix DAI link ID for rt715 on Lat…
RanderWang Feb 16, 2020
4629f5b
ASoC: Intel: sdw_rt711_rt1308_rt715: add ACPI ID check to support I2S…
RanderWang Feb 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 57 additions & 26 deletions sound/soc/intel/boards/sdw_rt711_rt1308_rt715.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
/* comment out this define for mono configurations */

#define MAX_NO_PROPS 2
#define MAX_HDMI_NUM 4
#define SDW_DMIC_DAI_ID 4

enum {
SOF_RT711_JD_SRC_JD1 = 1,
Expand All @@ -57,6 +59,7 @@ enum {
#define SOF_SDW_PCH_DMIC BIT(4)
#define SOF_SSP_PORT(x) (((x) & GENMASK(5, 0)) << 5)
#define SOF_SSP_GET_PORT(quirk) (((quirk) >> 5) & GENMASK(5, 0))
#define SOF_RT715_DAI_ID_FIX BIT(11)

static unsigned long sof_rt711_rt1308_rt715_quirk = SOF_RT711_JD_SRC_JD1;

Expand All @@ -81,7 +84,7 @@ struct codec_info {
};

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
static struct snd_soc_jack hdmi[3];
static struct snd_soc_jack hdmi[MAX_HDMI_NUM];

struct hdmi_pcm {
struct list_head head;
Expand Down Expand Up @@ -221,7 +224,8 @@ static const struct dmi_system_id sof_sdw_rt711_rt1308_rt715_quirk_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
},
.driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
SOF_SDW_MONO_SPK),
SOF_SDW_MONO_SPK |
SOF_RT715_DAI_ID_FIX),
},
{
.callback = sof_rt711_rt1308_rt715_quirk_cb,
Expand Down Expand Up @@ -490,6 +494,19 @@ static void rt1308_init(const struct snd_soc_acpi_link_adr *link,
}
}

static void rt715_init(const struct snd_soc_acpi_link_adr *link,
struct snd_soc_dai_link *dai_links,
struct codec_info *info,
bool playback)
{
/*
* DAI ID is fixed at SDW_DMIC_DAI_ID for 715 to
* keep sdw DMIC and HDMI setting static in UCM
*/
if (sof_rt711_rt1308_rt715_quirk & SOF_RT715_DAI_ID_FIX)
dai_links->id = SDW_DMIC_DAI_ID;
}

static struct codec_info codec_info_list[] = {
{
.id = 0x711,
Expand All @@ -508,7 +525,8 @@ static struct codec_info codec_info_list[] = {
{
.id = 0x715,
.direction = {false, true},
.dai_name = "rt715-aif2"
.dai_name = "rt715-aif2",
.init = rt715_init,
},
};

Expand All @@ -530,6 +548,9 @@ static inline int find_codec_info_acpi(const u8 *acpi_id)
{
int i;

if (!acpi_id[0])
return -EINVAL;

for (i = 0; i < ARRAY_SIZE(codec_info_list); i++)
if (!memcmp(codec_info_list[i].acpi_id, acpi_id,
ACPI_ID_LEN))
Expand Down Expand Up @@ -575,11 +596,11 @@ static void init_dai_link(struct snd_soc_dai_link *dai_links,
struct snd_soc_dai_link_component *cpus,
char *cpu_name,
struct snd_soc_dai_link_component *codecs,
int codecs_num,
int codecs_num, int dai_id,
int (*init)(struct snd_soc_pcm_runtime *rtd),
const struct snd_soc_ops *ops)
{
dai_links[id].id = id;
dai_links[id].id = dai_id;
dai_links[id].name = name;
dai_links[id].platforms = platform_component;
dai_links[id].num_platforms = ARRAY_SIZE(platform_component);
Expand Down Expand Up @@ -690,7 +711,7 @@ static void set_codec_init_func(const struct snd_soc_acpi_link_adr *link,
}

static int create_sdw_codec_dai(struct device *dev,
struct snd_soc_dai_link *dai_links, int id,
struct snd_soc_dai_link *dai_links, int *id,
struct snd_soc_dai_link_component *cpus,
const struct snd_soc_acpi_link_adr *link)
{
Expand Down Expand Up @@ -737,20 +758,23 @@ static int create_sdw_codec_dai(struct device *dev,
if (!cpu_name)
return -ENOMEM;

init_dai_link(dai_links, id + j, name, 1 - i, i, cpus, cpu_name,
codec, link->num_adr, NULL, NULL);
set_codec_init_func(link, dai_links + id + j, 1 - i);
init_dai_link(dai_links, *id, name, 1 - i, i, cpus, cpu_name,
codec, link->num_adr, *id, NULL, NULL);
set_codec_init_func(link, dai_links + *id, 1 - i);
(*id)++;
j++;
}

return j;
return 0;
}

static int sof_card_dai_links_create(struct device *dev,
struct snd_soc_acpi_mach *mach,
struct snd_soc_card *card)
{
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
struct snd_soc_dai_link_component *idisp_components;
#endif
struct snd_soc_dai_link_component *ssp_components;
struct snd_soc_acpi_mach_params *mach_params;
int ssp_num, sdw_num, hdmi_num = 0, dmic_num;
Expand All @@ -760,7 +784,7 @@ static int sof_card_dai_links_create(struct device *dev,
int num_links, ssp_mask;
char *name, *cpu_name;
int i, j, index, id = 0;
int val;
int ret, dai_id = 0;

/* reset amp_num to ensure amp_num++ starts from 0 in each probe */
for (i = 0; i < ARRAY_SIZE(codec_info_list); i++)
Expand All @@ -772,7 +796,14 @@ static int sof_card_dai_links_create(struct device *dev,
#endif

ssp_mask = SOF_SSP_GET_PORT(sof_rt711_rt1308_rt715_quirk);
ssp_num = hweight_long(ssp_mask);
/*
* on generic tgl platform, I2S or sdw mode is supported
* based on board rework. A ACPI device is registered in
* system only when I2S mode is supported, not sdw mode.
* Here check ACPI ID to confirm I2S is supported.
*/
index = find_codec_info_acpi(mach->id);
ssp_num = index >= 0 ? hweight_long(ssp_mask) : 0;

mach_params = &mach->mach_params;
sdw_num = get_sdw_dai_link_num(mach_params);
Expand Down Expand Up @@ -801,24 +832,25 @@ static int sof_card_dai_links_create(struct device *dev,
return -EINVAL;

for (; adr_link->num_adr; adr_link++) {
val = create_sdw_codec_dai(dev, links, id, cpus, adr_link);
if (val < 0) {
ret = create_sdw_codec_dai(dev, links, &id, cpus, adr_link);
if (ret < 0) {
dev_err(dev, "failed to create dai link %d", id);
return -ENOMEM;
}

id += val;
}

/*
* DAI link ID of SSP & DMIC & HDMI are based on last
* link ID used by sdw link. The dai_id is not always equal
* to ID for DAI link ID may be changed by some sdw codecs.
*/
dai_id = links[id - 1].id + 1;

SSP:
/* SSP */
if (!ssp_num)
goto DMIC;

index = find_codec_info_acpi(mach->id);
if (index < 0)
return -EINVAL;

for (i = 0, j = 0; ssp_mask; i++, ssp_mask >>= 1) {
struct codec_info *info;
char *codec_name;
Expand Down Expand Up @@ -848,10 +880,9 @@ static int sof_card_dai_links_create(struct device *dev,

ssp_components->name = codec_name;
ssp_components->dai_name = info->dai_name;

init_dai_link(links, id++, name, info->direction[0],
info->direction[1], cpus, cpu_name,
ssp_components, 1, NULL, info->ops);
ssp_components, 1, dai_id++, NULL, info->ops);

info->init(NULL, links + id - 1, info, 0);
}
Expand All @@ -860,10 +891,9 @@ static int sof_card_dai_links_create(struct device *dev,
/* dmic */
if (dmic_num > 0) {
init_dai_link(links, id++, "dmic01", 0, 1, cpus, "DMIC01 Pin",
dmic_component, 1, dmic_init, NULL);

dmic_component, 1, dai_id++, dmic_init, NULL);
init_dai_link(links, id++, "dmic16k", 0, 1, cpus, "DMIC16k Pin",
dmic_component, 1, dmic_init, NULL);
dmic_component, 1, dai_id++, dmic_init, NULL);
}

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
Expand Down Expand Up @@ -896,7 +926,8 @@ static int sof_card_dai_links_create(struct device *dev,
return -ENOMEM;

init_dai_link(links, id++, name, 1, 0, cpus, cpu_name,
idisp_components + i, 1, hdmi_init, NULL);
idisp_components + i, 1, dai_id++,
hdmi_init, NULL);
}
#endif

Expand Down