Commit Graph

245 Commits

Author SHA1 Message Date
Liam Girdwood 6da07a9116
Merge pull request #137 from keqiaozhang/icl-tplg
topology: add 4-ch dmic topology for ICL
2018-11-21 15:42:18 +00:00
Zhang Keqiao 093f6b70da topology: add 4-ch dmic topology for ICL
Signed-off-by: Zhang Keqiao <keqiao.zhang@linux.intel.com>
2018-11-21 16:06:21 +08:00
Mengdong Lin 7e2f4e3b9c topology: Remove sof-apl-hdmi.m4
sof-apl-hdmi.m4 is no longer needed.

It was used in early stage of HDA enablement as the 1st reference.
Now HDA settings are added to UP2/GLK/WHL platform m4 files.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
2018-11-20 19:37:48 -05:00
Curtis Malainey d710f99de9 Update sof-icl-nocodec
Update graph

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:28:47 -08:00
Curtis Malainey 4194dae527 Update sof-hsw-rt5640
Update comments and graph

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:27:33 -08:00
Curtis Malainey 25e6b20f03 Fix sof-apl-da7219 typo
Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:24:32 -08:00
Curtis Malainey c1c6842036 Update sof-glk-da7219
Update graph and comments

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:22:34 -08:00
Curtis Malainey c304613744 Update sof-cnl-rt274
Update graph to represent actual layout

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:17:45 -08:00
Curtis Malainey 2331cfaf9e Update sof-cht-nocodec
Update graph comments

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:14:03 -08:00
Curtis Malainey 3560320ca3 Update sof-cht-max98090 graph
Update to properly reflect code

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:11:58 -08:00
Curtis Malainey f18a895aec Update sof-byt-rt5651
Correct graph

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:09:50 -08:00
Curtis Malainey adf6db4d85 Update sof-byt-rt5645 graph
update graph to represent code

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:09:40 -08:00
Curtis Malainey 141493604a Update sof-byt-rt5640 graph
correct graph

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-16 15:05:38 -08:00
Curtis Malainey d5ac458f56 Update sof-byt-nocodec
Make it clearer that there is no codec as well as update the media graph

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey 9f210ad755 Update sof-byt-da7213
Update graph to represent code

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey 888260a768 Update comments for sof-bdw-rt286
Update header to reflect code

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey 5452897dc9 update sof-apl-tdf8532
consolidate graph styles

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey af9d2d4e57 Fix sof-apl-pcm512x
Fix graph to reflect file

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey 79252d6c46 Fix sof-apl-nocodec comments
Follow graph convention in other files as well as fix typos and comments

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey 42e9bd979d Fix sof-apl-eq-pcm512x comments
Fix copy paste errors

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey b65fe8e021 Fix sof-apl-eq-dmic comments
Fix copy paste comment errors

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey f704d361e1 Fix pipe-eq-capture comments
Fix copy paste comment errors

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:23 -08:00
Curtis Malainey cbf60f2bb2 Correct sof-bdw-rt5640
Correct comments to reflect code

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-11-15 18:54:14 -08:00
Ranjani Sridharan 22fba69dfb topology: glk: fix channel count for dmic stereo recording
Fix the channel count to 2 for stereo dmic recording.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
2018-10-31 22:35:00 -07:00
Liam Girdwood c9a4c87d7a
Merge pull request #114 from plbossart/fix/ipc-alignment
topology: renumber SSP tokens - ABI CHANGE
2018-10-24 14:03:04 +01:00
Pierre-Louis Bossart 8d0f1783a6 topology: renumber SSP tokens - ABI CHANGE
Initial _ACTIVE fields are replaced by a single clock control
This change can lead to regressions, it needs to be aligned with the same
change at the kernel level.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
2018-10-23 12:28:47 -05:00
Seppo Ingalsuo 8d4b10c539 Topology: Add 2ch and 4ch raw DMIC capture topologies for APL
This patch adds two minimal capture topologies to enable doing tests
those require raw audio capture with unmodified S32_LE samples, e.g.
channels order preserve test where the mic # origin can be checked
from side information in LSB bits.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-23 11:27:25 +03:00
Liam Girdwood a1dfcb7f4b
Merge pull request #110 from xiulipan/pr/daidir
Add direction for dai widget in topology
2018-10-18 16:58:20 +01:00
Pan Xiuli 25dcef9219 topolgy: m4: add direction for widget dai
Add direction for widget dai, 0 for playback and 1 for capture.

Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-10-18 18:59:24 +08:00
Pan Xiuli 489832137c topology: m4: add SOF_TKN_DAI_DIRECTION for DAI
Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-10-18 18:59:18 +08:00
Pan Xiuli b6016cd5e5 topology: duplicate dai formart for pcm add
In PIPELINE_PCM_ADD, DAI_FORMAT is not set but are used later.
Need to set this value to avoid protenial issues.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-10-18 18:43:37 +08:00
Seppo Ingalsuo 53f90d9c6a Topology: DMIC: Reduce PCM capabilities to DMIC configuration
This patch impacts topologies sof-apl-nocodec, sof-apl-da7219, and
sof-glk-da7219 those use the pipe-passthrough-capture macro for DMIC.

The PCM saple rate is limited to 48 kHz (was 8 - 192 kHz). The capture
channels count can be only PIPELINE_CHANNELS (was 1 - PIPELINE_CHANNELS).
This prevents corrupted audio capture that happens when DMIC topology
parameters and capture parameters differ. It happens because DMIC FIFOs
drop samples or add unwanted samples when the configuration does not match.

In sof-apl-nocodec topology the PIPELINE_CHANNELS is set to 2 that
matches the configuration.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-18 12:42:38 +03:00
Pan Xiuli 97ae708c5e topology: enable hdmi support on UP2 board
Add HDMI support to sof-apl-pcm512x

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
2018-10-15 08:16:24 +08:00
Liam Girdwood c0a881a3b7
Merge pull request #101 from juimonen/test_pr
tests: add qa tests and rearrange other tests under one directory
2018-10-14 22:41:17 +01:00
Jaska Uimonen 0808765bf4 tests: add qa tests and rearrange other tests under one directory
Previously we used to have tests scattered around, so let's put
them under one directory to make things more clear.

Now under top level test directory we have directories:

audio - objective audio quality tests
used to be under test/

qa - qa tests run by the CI
new test component in soft repo

topology - topology test file generation
used to be under topology/tests

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2018-10-12 08:12:49 +03:00
Seppo Ingalsuo 27281d75e7 Topology: Add DMIC capture pipeline with gain and high-pass filter
This patch adds topology sof-apl-eq-dmic to help testing acoustical
audio capture via DMIC or work as example for other machine drivers. The
capture format is set as four channels, S32_LE, 48 kHz. The IIR EQ is
a 2nd order Butterworth high-pass with cut-off frequency at 50 Hz to
suppress non-audible lowest frequencies. The EQ provides additional
+20 dB gain to avoid the recording to sound too silent.

The IIR EQ or additional FIR EQ instance can when needed provide other
form factor specific equalization.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
2018-10-11 17:12:27 +03:00
Rander Wang c569a95905 WHL: add a bespoke hda topology for WHL
Only passthrough is required on WHL

Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
2018-10-09 10:52:06 +08:00
Curtis Malainey 9050d82a7d Use passed in number of channels for pipeline
Pipelines should not expose more channels than what they are configured
to support.

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-10-02 13:54:04 -07:00
Rander Wang 2f65d96833 hda: add virtual widgets to kill error message in kernel log
Signed-off-by: Rander Wang <rander.wang@linux.intel.com>
2018-09-29 10:40:21 +08:00
Liam Girdwood 18c9950855
Merge pull request #82 from keyonjie/master
topology: add topology file for hda generic machine
2018-09-28 08:39:47 +01:00
Liam Girdwood 933fce3c88
Merge pull request #79 from bardliao/apl_rvp
topology: initial topology file for APL RVP
2018-09-28 08:23:50 +01:00
Keyon Jie 8dc01f7cb5 topology: add topology file for hda generic machine
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-09-28 14:21:05 +08:00
Bard liao 41184b076f topology: initial topology file for APL RVP
It is basically copy from sof-apl-pcm512x.m4 and add hdmi support

Signed-off-by: Bard liao <bard.liao@intel.com>
2018-09-27 10:50:14 +08:00
Keyon Jie 110378d61c topology: sof-glk-da7219: update to use s32le format for HDMI pipelines
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
2018-09-26 17:08:22 +08:00
Jaska Uimonen 6b56dafe30 Topology: Add generic type string to effect widgets data field
Adding type string to widget data allows the driver to identify
different effects. As an example use this in the equalizer.

Also modify equalizer to pass default parameters in control's
private data.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2018-09-25 08:26:30 +03:00
Seppo Ingalsuo baa791f6e1 Topology: Add Equalizer
This patch adds EQ, bytecontrol, and EQ+volume pipeline m4 macros and an
enhanced topology with EQ for UP2 + HiFiberry. There is not yet FIR/IIR
type select. The EQ type is currently hardcoded into kernel.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2018-09-25 08:26:15 +03:00
Curtis Malainey 46fc6fdf6e Set capabilities of channels to those defined in topology
Do not use a static defined number of channels, use the channels passed
in otherwise ASoC will try to allocate number of channels that should
not be allowed.

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
2018-09-21 13:21:12 -07:00
Mengdong Lin 4c9e3ddaf3 topology: Add 3 HDMI/DP PCMs and backends for GLK
Define 3 new PCMs and backends for HDMI/DP playback on GLK platform.

Here are the updated pipelines in sof-glk-da7219.m4:
PCM0  ----> volume (pipe 1)   ---> SSP1 (speaker - maxim98357a, BE link 0)
PCM1  <---> volume (pipe 2,3) <--> SSP2 (headset - da7219, BE link 1)
PCM99 <---- volume (pipe 4)   <--- DMIC0 (dmic capture, BE link 2)
PCM5  ----> volume (pipe 5)   ---> iDisp1 (HDMI/DP playback, BE link 3)
PCM6  ----> Volume (pipe 6)   ---> iDisp2 (HDMI/DP playback, BE link 4)
PCM7  ----> volume (pipe 7)   ---> iDisp3 (HDMI/DP playback, BE link 5)

There is also support for changing HDMI/DP pipelines to pass-through for
validation purpose, which is commented off by default.

Pleaes note that 3 virtual widgets hifi1~3 are removed, because they'll
be created by HDMI codec driver. This m4 was verified on GLK platform.
2018-09-06 15:16:55 -04:00
Jaska Uimonen 1354af8b66 topology: make building tests into a separate target
Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
2018-09-04 17:50:43 +03:00
Liam Girdwood 9af65849fa
Merge pull request #65 from juimonen/m4debug
[RFC] topology: first try of m4 debug macros
2018-09-04 13:09:03 +01:00