Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
02a513a
ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format()
kmarinushkin Apr 4, 2018
cba6339
ASoC: topology: Add missing clock gating parameter when parsing hw_co…
kmarinushkin Apr 4, 2018
fdab575
ASoC: topology: Add definitions for mclk_direction values
kmarinushkin Apr 4, 2018
5625100
ASoC: topology: Add support for compressed PCMs
lrgirdwo Mar 27, 2018
64859fb
ASoC: fix 0-day warnings with snd_soc_new_compress()
plbossart May 29, 2018
e022fa0
ASoC: Intel: cht-bsw-rt5672: allow for topology-defined codec-dai setup
plbossart Apr 27, 2018
6bde10d
ALSA: core api: define offsets for TLV items
ranj063 May 10, 2018
4c685a7
ASoC: pcm512x: Add ACPI support
plbossart May 17, 2018
9f2ec80
ASoC: Intel: Disable SND_SOC_INTEL_BAYTRAIL when SND_SST_ATOM_HIFI2_P…
jwrdegoede Apr 13, 2018
28fe6c4
ASoC: topology: Give more data to clients via callbacks
lrgirdwo Jun 14, 2018
4c8ac45
ASoC: topology: Add callback for DAPM route load/unload
lrgirdwo Jun 14, 2018
2695cf5
ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs
lrgirdwo Jun 14, 2018
02dd6a5
ASoC: Intel: broxton: reduce machine name for bxt_da7219_max98357a
naveen-manohar Jun 18, 2018
3c71f58
ASoC: Intel: Skylake: cleanup before moving ACPI tables
plbossart Jun 18, 2018
7a3d054
ASoC: Intel: move SKL+ codec ACPI tables to common directory
plbossart Jun 18, 2018
674ee8a
ASoC: Intel: common: Add Geminilake Dialog+Maxim machine driver entry
naveen-manohar Jun 18, 2018
19d4dd5
ASoC: Intel: common: add firmware/topology information for SOF
plbossart Jun 18, 2018
82e7ce8
ASoC: Intel: common: add entries for SOF-based machine drivers
plbossart Jun 18, 2018
c94ec7c
ASoC: Intel: common: fix copy/paste issue with SOF/broadwell topology…
plbossart Jun 18, 2018
453d691
ASoC: Intel: common: rename 'reef' to 'sof' in ACPI matching table
plbossart Mar 12, 2018
f4cd2bc
ASoC: core: Allow topology to override machine driver FE DAI link con…
lrgirdwo Jan 8, 2018
ca84505
[SQUASHME?] ASoC: core: Add name prefix for machines with topology re…
lrgirdwo Mar 9, 2018
51f05df
ALSA: core: Allow drivers to set R/W wait time.
lrgirdwo Jan 8, 2018
d4da475
ASoC: SOF: Add Sound Open Firmware driver core
lrgirdwo Jan 8, 2018
d2ee6b1
ASoC: SOF: Add Sound Open Firmware KControl support
lrgirdwo Jan 8, 2018
4c649d0
ASoC: SOF: Add driver debug support.
lrgirdwo Jan 8, 2018
ce4ffeb
ASoC: SOF: Add support for IPC IO between DSP and Host
lrgirdwo Jan 8, 2018
9c9d49d
ASoC: SOF: Add PCM operations support
lrgirdwo Jan 8, 2018
95545bc
ASoC: SOF: Add support for loading topologies
lrgirdwo Jan 8, 2018
496c29a
ASoC: SOF: Add DSP firmware trace event support
lrgirdwo Jan 8, 2018
95b1b4e
ASoC: SOF: Add DSP HW abstraction operations
lrgirdwo Jan 8, 2018
41ff0a4
ASoC: SOF: Add firmware loader support
lrgirdwo Jan 8, 2018
a8711d6
ASoC: SOF: Add compressed PCM support
lrgirdwo Jan 8, 2018
7c7884f
ASoC: SOF: Add PM support
lrgirdwo Jan 16, 2018
543caaf
ASoC: SOF: Add Nocodec machine driver support
lrgirdwo Jan 8, 2018
8c5bb0f
ASoC: SOF: Intel: Add BYT, CHT and BSW DSP HW support.
lrgirdwo Jan 8, 2018
a289d92
ASoC: SOF: Intel: Add HSW HW DSP support
lrgirdwo Jan 8, 2018
80c1ab5
ASoC: SOF: Intel: Add support for BDW HW DSP support
lrgirdwo Jan 8, 2018
d3be805
ASoC: SOF: Intel: Add APL/CNL HW DSP support
lrgirdwo Jan 8, 2018
7f48b6b
ASoC: SOF: Intel: Add HDA controller for Intel DSP
lrgirdwo May 9, 2018
5d9b8b0
ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations
lrgirdwo May 9, 2018
e10ad95
ASoC: SOF: Intel: Add Intel specific HDA IPC mechanisms.
lrgirdwo May 9, 2018
8bb0c74
ASoC: SOF: Intel: Add Intel specific HDA firmware loader
lrgirdwo May 9, 2018
36319f4
ASoC: SOF: Intel: Add Intel specific HDA PCM operations
lrgirdwo May 9, 2018
c194611
ASoC: SOF: Intel: Add Intel specific HDA stream operations
lrgirdwo May 9, 2018
0489f5a
ASoC: SOF: Intel: Add Intel specific HDA trace operations
lrgirdwo May 9, 2018
db1915c
ASoC: SOF: Intel: Add platform differentiation for SKL, APL and CNL
lrgirdwo May 9, 2018
843579f
ASoC: SOF: Add userspace ABI support
lrgirdwo Jan 8, 2018
4078be4
ASoC: SOF: Add VirtIO support
lrgirdwo Jan 8, 2018
361530c
ASoC: SOF: Add SPI device support
lrgirdwo Jan 8, 2018
4021d60
ASoC: SOF: Add ACPI device support
lrgirdwo Jan 8, 2018
7bdc920
ASoC: SOF: Add PCI device support
lrgirdwo Jan 8, 2018
bea036a
ASoC: SOF: Add Build support for SOF core and Intel drivers
lrgirdwo Jan 8, 2018
2c48cab
ASoC: Intel: Kconfig: disable SST and legacy drivers when SOF is sele…
plbossart May 31, 2018
5119fdb
ASoC: SOF: refine dapm route loading in sof
RanderWang May 25, 2018
92e8a50
ASoC: SOF: parse Xtensa exception causes
xiulipan May 25, 2018
507d6f9
ASoC: uapi: sof: Add ipc config params and topology tokens for DMIC D…
ranj063 May 27, 2018
4942703
ASoC: SOF: Add support for parsing DMIC specific tokens from topology
ranj063 May 27, 2018
3f3abba
ASoC: SOF: support DMIC DAI type during link fixup
ranj063 May 27, 2018
f1ebcc2
[WORKAROUND] ASoC: SOF: start HDA DMA at hw_params() stage and remove…
keyonjie May 15, 2018
0ba34ad
ASoC: Intel: make bytcht_da7213 with SOF
plbossart Mar 9, 2018
8b2b17c
ASoC: Intel: make cht_bsw_max98090 work with SOF
plbossart Mar 9, 2018
46a1199
ASoC: Intel: cht-bsw-rt5645: work with SOF
plbossart Nov 10, 2017
2759eb0
ASoC: Intel: cht-bsw-rt5672: work with SOF
plbossart Nov 30, 2017
87d8985
ASoC: Intel: make bytcr_rt5640 work with SOF
plbossart Dec 21, 2017
9b9e392
ASoC: Intel: Make sure HSW/BDW based machine drivers build for SOF
lrgirdwo Dec 7, 2017
e63c8a9
ASoC: Intel: Kconfig: expose common option between SST and SOF drivers
plbossart Jan 9, 2018
fff657f
ASoC: Intel: select relevant machine drivers for SOF
plbossart Dec 7, 2017
a3039a0
ASoC: Intel: add machine driver for BXT/APL with pcm512x codec
plbossart Apr 23, 2018
18ba099
ASoC: Intel: add rt274 machine driver for cnl
RanderWang May 18, 2018
1ac86e1
ASoC: Intel: make cnl_rt274 work with SOF
plbossart May 18, 2018
270eb22
ASoC: tdf8532: NXP TDF8532 audio class-D amplifier driver
May 15, 2018
f7bae90
ASoC: tdf8532: Fix compilation warnings
May 15, 2018
e26299c
ASoC: tdf8532: Add delay while reading a packet from I2C
May 15, 2018
8dd7f4a
ASoC: tdf8532: Fix the codec status error issue on APL-GPMRB
May 15, 2018
052f669
ASoC: Intel: Boards: Add BXTP MRB machine driver for NXP TDF8532
keyonjie May 22, 2018
439aaa9
ASoC: Intel: bxt-tdf8532: reuse machine driver for GP-MRB
keyonjie May 22, 2018
b6666c6
ASoC: Intel: bxt-tdf8532: FIX: don't use add_dai_link() for SOF
keyonjie May 28, 2018
77467b9
ALSA: HACK: Fix rmmod crash
lrgirdwo Nov 3, 2017
dbf9e8c
[NOT FOR UPSTREAM] ASoC: SOF: enable DEBUG by default
plbossart Apr 16, 2018
bc4b9e3
ASoC: Intel: replace snd_soc_codec to snd_soc_component in bxt-pcm512x
xiulipan Jun 7, 2018
b7229c1
ASoC: Intel: bytcr_rt5651: work with sof only with SSP2 AIF1
xiulipan Jun 6, 2018
b83deba
ASoC: SOF: topology: free volume table while unloading pga widget
ranj063 Jun 10, 2018
ed6cb43
acpi: blacklist: remove quirk for Dell XPS13 when SOF is enabled
plbossart Jun 12, 2018
e97bc1f
ASoC: Intel: common: add ACPI match for CannonLake
plbossart Jun 12, 2018
af410da
ASoC: SOF: fix warning about assigning __le to u16 type
ranj063 Jun 12, 2018
c5450f7
ASoC: SOF: topology: fix dmic pdm token offsets
ranj063 Jun 12, 2018
04ca261
ASoC: SOF: topology: fix logic for parsing dmic pdm tokens
ranj063 Jun 12, 2018
f42f8cf
ASoC: SOF: refinement for HDA DMA start/stop
keyonjie Jun 13, 2018
aaeb5cf
ASoC: uapi: sof: remove dmac id and dmac channel members from ipc hos…
ranj063 Jun 13, 2018
9b0fa72
ASoC: uapi: sof: remove DMAC ID and DMAC channel tokens
ranj063 Jun 13, 2018
4bd6b22
ASoC: SOF: topology: remove dmac id and dmac channel token parsing
ranj063 Jun 13, 2018
59efe71
ASoC: SOF: Move xtensa oops/stack dump out of SOF core
lrgirdwo Jun 14, 2018
df15329
ASoC: SOF: Cleanup priv.h and add comments for upstreaming.
lrgirdwo Jun 15, 2018
51f6db7
ASoC: Intel: replace snd_soc_codec to snd_soc_component in cnl_rt274
xiulipan Jun 20, 2018
9b843df
ASoC: Intel: common: add ACPI matching tables for ICL
plbossart Jun 22, 2018
2b2dae0
ASoC: uapi: sof: rename clk_id to mclk_id to make it explicit and fix…
ranj063 Jun 20, 2018
7f45e9b
ASoC: uapi: sof: add token for SSP MCLK ID
ranj063 Jun 20, 2018
e409473
ASoC: SOF: topology: add SSP_MCLK_ID to ssp_tokens to enable parsing …
ranj063 Jun 20, 2018
cb05347
ASoC: SOF: merge sample_bits tokens with the rest of the ssp_tokens
ranj063 Jun 25, 2018
049371d
ASoC: SOF: Add debug_mode flag in sof dev
xiulipan Jun 13, 2018
0e67182
ASoC: SOF: debug: add debugmode debugfs for sof_dev debug_mode
xiulipan Jun 13, 2018
36cb300
ASoC: SOF: uapi: topology: Add SOF_TKN_DAI_EXT_CONFIG dai extra config
xiulipan Jun 4, 2018
f274a94
ASoC: SOF: add SOF_DAI_EXT_SSP_LBM bit for the DAI CONFIG
xiulipan Jun 28, 2018
a1c419f
ASoC: SOF: add headers for switch control callback functions
xiulipan Jun 20, 2018
e95f693
ASoC: SOF: add switch kcontrol callback functions
xiulipan Jun 20, 2018
b45116c
ASoC: SOF: topology: Add topology handler for dai lbm kcontrol
xiulipan Jun 20, 2018
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
Prev Previous commit
Next Next commit
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>
(cherry picked from commit f0d9034)
  • Loading branch information
plbossart committed Jun 19, 2018
commit c94ec7c2daa5fa0e6c37224a13b03632a010f7e7
2 changes: 1 addition & 1 deletion sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
{
Expand Down