From: Mark Brown <broonie@kernel.org>
To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: tiwai@suse.de, liam.r.girdwood@linux.intel.com,
alsa-devel@alsa-project.org, broonie@kernel.org,
vkoul@kernel.org
Subject: Applied "ASoC: Intel: common: fix copy/paste issue with SOF/broadwell topology file" to the asoc tree
Date: Tue, 19 Jun 2018 16:24:31 +0100 [thread overview]
Message-ID: <E1fVIUh-0002LO-6T@debutante> (raw)
In-Reply-To: <20180618182942.4925-9-pierre-louis.bossart@linux.intel.com>
The patch
ASoC: Intel: common: fix copy/paste issue with SOF/broadwell topology file
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From f0d9034b290d8bad590e843c2a1081eb47d813ad Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Mon, 18 Jun 2018 13:29:42 -0500
Subject: [PATCH] ASoC: Intel: common: fix copy/paste issue with SOF/broadwell
topology file
There are two commercially-available Broadwell platforms based on I2S
(Dell XPS13 and 'Samus' Pixel 2015 Chromebook).
Fix a copy/paste issue to allow each platform to enable different
features if needed when SOF is enabled
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
index e0e8c8c27528..53e7acdfbb81 100644
--- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
@@ -45,7 +45,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = {
.drv_name = "bdw-rt5677",
.fw_filename = "intel/IntcSST2.bin",
.sof_fw_filename = "intel/reef-bdw.ri",
- .sof_tplg_filename = "intel/reef-bdw-rt286.tplg",
+ .sof_tplg_filename = "intel/reef-bdw-rt5677.tplg",
.asoc_plat_name = "haswell-pcm-audio",
},
{
--
2.17.1
prev parent reply other threads:[~2018-06-19 15:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 18:29 [PATCH 0/8] ASoC: Intel: common ACPI tables - take2 Pierre-Louis Bossart
2018-06-18 18:29 ` [PATCH 1/8] ASoC: Intel: broxton: reduce machine name for bxt_da7219_max98357a Pierre-Louis Bossart
2018-06-18 18:29 ` [PATCH 2/8] ASoC: Intel: Skylake: cleanup before moving ACPI tables Pierre-Louis Bossart
2018-06-19 15:24 ` Applied "ASoC: Intel: Skylake: cleanup before moving ACPI tables" to the asoc tree Mark Brown
2018-06-18 18:29 ` [PATCH 3/8] ASoC: Intel: move SKL+ codec ACPI tables to common directory Pierre-Louis Bossart
2018-06-19 15:24 ` Applied "ASoC: Intel: move SKL+ codec ACPI tables to common directory" to the asoc tree Mark Brown
2018-06-18 18:29 ` [PATCH 4/8] ASoC: Intel: common: Add Geminilake Dialog+Maxim machine driver entry Pierre-Louis Bossart
2018-06-19 15:24 ` Applied "ASoC: Intel: common: Add Geminilake Dialog+Maxim machine driver entry" to the asoc tree Mark Brown
2018-06-18 18:29 ` [PATCH 5/8] ASoC: Intel: common: add firmware/topology information for SOF Pierre-Louis Bossart
2018-06-19 15:24 ` Applied "ASoC: Intel: common: add firmware/topology information for SOF" to the asoc tree Mark Brown
2018-06-18 18:29 ` [PATCH 6/8] ASoC: Intel: common: add Geminilake Realtek+Maxim machine driver entry Pierre-Louis Bossart
2018-06-18 18:29 ` [PATCH 7/8] ASoC: Intel: common: add entries for SOF-based machine drivers Pierre-Louis Bossart
2018-06-19 15:24 ` Applied "ASoC: Intel: common: add entries for SOF-based machine drivers" to the asoc tree Mark Brown
2018-06-18 18:29 ` [PATCH 8/8] ASoC: Intel: common: fix copy/paste issue with SOF/broadwell topology file Pierre-Louis Bossart
2018-06-19 15:24 ` Mark Brown [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1fVIUh-0002LO-6T@debutante \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.de \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox