Skip to content

SoundWire: transition to generic machine driver #1889

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 6 commits into from
Mar 19, 2020
Merged

SoundWire: transition to generic machine driver #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa80272
ALSA: core: sysfs: show components string
plbossart Mar 13, 2020
45125d2
ASoC: Intel: soc-acpi: transition to generic SoundWire machine driver
plbossart Mar 11, 2020
6522c3f
ASoC: Intel: soc-acpi: fix CML RVP
plbossart Mar 17, 2020
aaac218
ASoC: Intel: transition to generic SoundWire machine driver
plbossart Mar 11, 2020
df287ca
ASoC: Intel: boards: sof_sdw: redefined MONO_SPK quirk
plbossart Mar 18, 2020
a27eabc
ASoC: Intel: sof_sdw: only init DMICs once
plbossart Mar 18, 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
12 changes: 12 additions & 0 deletions sound/core/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,9 +695,21 @@ card_number_show_attr(struct device *dev,

static DEVICE_ATTR(number, 0444, card_number_show_attr, NULL);

static ssize_t
components_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct snd_card *card = container_of(dev, struct snd_card, card_dev);

return scnprintf(buf, PAGE_SIZE, "%s\n", card->components);
}

static DEVICE_ATTR_RO(components);

static struct attribute *card_dev_attrs[] = {
&dev_attr_id.attr,
&dev_attr_number.attr,
&dev_attr_components.attr,
NULL
};

Expand Down
22 changes: 7 additions & 15 deletions sound/soc/intel/boards/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,30 +542,22 @@ endif ## SND_SOC_SOF_JASPERLAKE

if SND_SOC_SOF_INTEL_SOUNDWIRE

config SND_SOC_INTEL_SOUNDWIRE_RT700_MACH
tristate "SoundWire with RT700 codec"
depends on SOUNDWIRE && ACPI
depends on SND_HDA_CODEC_HDMI
select SND_SOC_RT700_SDW
select SND_SOC_DMIC
help
Add support for Intel SoundWire-based platforms connected to RT700
on link 0 or 1
If unsure select "N"

config SND_SOC_INTEL_SOUNDWIRE_RT711_RT1308_RT715_MACH
tristate "SoundWire with RT711, RT1308 and RT715"
config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
tristate "SoundWire generic machine driver"
depends on I2C && ACPI
depends on MFD_INTEL_LPSS || COMPILE_TEST
depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST
depends on SOUNDWIRE
depends on SND_HDA_CODEC_HDMI
select SND_SOC_RT700_SDW
select SND_SOC_RT711_SDW
select SND_SOC_RT1308_SDW
select SND_SOC_RT1308
select SND_SOC_RT715_SDW
select SND_SOC_DMIC
help
Add support for Intel SoundWire-based platforms connected to RT711,
RT1308 and RT715
Add support for Intel SoundWire-based platforms connected to
RT700, RT711, RT1308 and RT715
If unsure select "N".

endif
Expand Down
10 changes: 5 additions & 5 deletions sound/soc/intel/boards/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ snd-soc-skl_hda_dsp-objs := skl_hda_dsp_generic.o skl_hda_dsp_common.o hda_dsp_c
snd-skl_nau88l25_max98357a-objs := skl_nau88l25_max98357a.o
snd-soc-skl_nau88l25_ssm4567-objs := skl_nau88l25_ssm4567.o
snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o hda_dsp_common.o
snd-soc-sdw-rt700-objs := sdw_rt700.o hda_dsp_common.o
snd-soc-sdw-rt711-rt1308-rt715-objs := sdw_rt711_rt1308_rt715.o hda_dsp_common.o

snd-soc-sof-sdw-objs += sof_sdw.o \
sof_sdw_rt711.o sof_sdw_rt700.o \
sof_sdw_rt1308.o sof_sdw_rt715.o \
sof_sdw_dmic.o sof_sdw_hdmi.o hda_dsp_common.o
obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o
obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
Expand Down Expand Up @@ -68,5 +69,4 @@ obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH) += snd-skl_nau88l25_max9
obj-$(CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH) += snd-soc-skl_nau88l25_ssm4567.o
obj-$(CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH) += snd-soc-skl_hda_dsp.o
obj-$(CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH) += snd-soc-sof_da7219_max98373.o
obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_RT700_MACH) += snd-soc-sdw-rt700.o
obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_RT711_RT1308_RT715_MACH) += snd-soc-sdw-rt711-rt1308-rt715.o
obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH) += snd-soc-sof-sdw.o
Loading