Skip to content

Enable SOF on Broadwell/Samus (bdw-rt5677) #1659

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 2 commits into from
Jan 7, 2020
Merged

Enable SOF on Broadwell/Samus (bdw-rt5677) #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66dc4ef
ASoC: Intel: bdw-rt5677: fix Kconfig dependencies
plbossart Jan 6, 2020
fb03cd4
ASoC: Intel: bdw-rt5677: change cpu_dai and platform components for SOF
plbossart Jan 6, 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
3 changes: 3 additions & 0 deletions sound/soc/intel/boards/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ config SND_SOC_INTEL_BDW_RT5677_MACH
depends on I2C_DESIGNWARE_PLATFORM || COMPILE_TEST
depends on GPIOLIB || COMPILE_TEST
depends on X86_INTEL_LPSS || COMPILE_TEST
depends on SPI_MASTER
select SPI_PXA2XX
select SND_SOC_RT5677_SPI
select SND_SOC_RT5677
help
This adds support for Intel Broadwell platform based boards with
Expand Down
10 changes: 9 additions & 1 deletion sound/soc/intel/boards/bdw-rt5677.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,14 @@ SND_SOC_DAILINK_DEF(platform,
SND_SOC_DAILINK_DEF(be,
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-RT5677CE:00", "rt5677-aif1")));

#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
SND_SOC_DAILINK_DEF(ssp0_port,
DAILINK_COMP_ARRAY(COMP_CPU("ssp0-port")));
#else
SND_SOC_DAILINK_DEF(ssp0_port,
DAILINK_COMP_ARRAY(COMP_DUMMY())));
Copy link

@cujomalainey cujomalainey Jan 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One too many brackets there. Fails to compile

Copy link
Member Author

@plbossart plbossart Jan 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xiulipan @fredoh9 I thought we compiled in SST mode? We have a kconfig-sst.sh, isn't this used?

Copy link

@cujomalainey cujomalainey Jan 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Travis did catch the error
https://travis-ci.org/thesofproject/linux/jobs/633817565#L2610

#endif

/* Wake on voice interface */
SND_SOC_DAILINK_DEFS(dsp,
DAILINK_COMP_ARRAY(COMP_CPU("spi-RT5677AA:00")),
Expand Down Expand Up @@ -342,7 +350,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
.dpcm_playback = 1,
.dpcm_capture = 1,
.init = bdw_rt5677_init,
SND_SOC_DAILINK_REG(dummy, be, dummy),
SND_SOC_DAILINK_REG(ssp0_port, be, platform),
},
};

Expand Down