conf: topology: Add Skylake i2s conf

The Skylake topology configuration for simple topology graph is
provided. This exposes the PCM capabilities of the DSP.

Signed-off-by: Shreyas NC <shreyas.nc@intel.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/configure.ac b/configure.ac
index c265ec9e159bdf76a6829ab8f7d625ac72b25501..1bf75e6d9c2b71cba32d51ff8c5f18beb7a6c795 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -661,6 +661,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
          src/conf/topology/Makefile \
          src/conf/topology/broadwell/Makefile \
          modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
+         src/conf/topology/sklrt286/Makefile \
          alsalisp/Makefile aserver/Makefile \
          test/Makefile test/lsb/Makefile \
          utils/Makefile utils/alsa-lib.spec utils/alsa.pc)

diff --git a/src/conf/topology/Makefile.am b/src/conf/topology/Makefile.am
index f56a96c651e5d2a4e617b22d355dfb9f477a3658..cbdb7cf07c9777645274adccd5b86279f4379ea2 100644 (file)
--- a/src/conf/topology/Makefile.am
+++ b/src/conf/topology/Makefile.am
@@ -1 +1 @@
-SUBDIRS=broadwell
+SUBDIRS=broadwell sklrt286

diff --git a/src/conf/topology/sklrt286/Makefile.am b/src/conf/topology/sklrt286/Makefile.am
new file mode 100644 (file)
index 0000000..facc508
--- /dev/null
+++ b/src/conf/topology/sklrt286/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+sklrt286dir = $(alsaconfigdir)/topology/sklrt286
+sklrt286_DATA = skl_i2s.conf media0_in-cpr-0.bin media0_in-mi.bin media0_out-mo.bin media0_out-cpr-6.bin codec0_out-mo.bin codec0_out-cpr-4.bin codec1_out-mo.bin codec1_out-cpr-5.bin codec0_in-cpr-1.bin codec0_in-mi.bin dmic01_hifi_in-cpr-3.bin dmic01_hifi_in-mi.bin hdmi1_pt_out-cpr-7.bin hdmi1_pt_out-cpr-8.bin hdmi2_pt_out-cpr-9.bin hdmi2_pt_out-cpr-10.bin hdmi3_pt_out-cpr-11.bin hdmi3_pt_out-cpr-12.bin 
+EXTRA_DIST = $(sklrt286_DATA)

diff --git a/src/conf/topology/sklrt286/codec0_in-cpr-1.bin b/src/conf/topology/sklrt286/codec0_in-cpr-1.bin
new file mode 100644 (file)
index 0000000..a3079d4
Binary files /dev/null and b/src/conf/topology/sklrt286/codec0_in-cpr-1.bin differ

diff --git a/src/conf/topology/sklrt286/codec0_in-mi.bin b/src/conf/topology/sklrt286/codec0_in-mi.bin
new file mode 100644 (file)
index 0000000..8e431d4
Binary files /dev/null and b/src/conf/topology/sklrt286/codec0_in-mi.bin differ

diff --git a/src/conf/topology/sklrt286/codec0_out-cpr-4.bin b/src/conf/topology/sklrt286/codec0_out-cpr-4.bin
new file mode 100644 (file)
index 0000000..7cb0e34
Binary files /dev/null and b/src/conf/topology/sklrt286/codec0_out-cpr-4.bin differ

diff --git a/src/conf/topology/sklrt286/codec0_out-mo.bin b/src/conf/topology/sklrt286/codec0_out-mo.bin
new file mode 100644 (file)
index 0000000..7705767
Binary files /dev/null and b/src/conf/topology/sklrt286/codec0_out-mo.bin differ

diff --git a/src/conf/topology/sklrt286/codec1_out-cpr-5.bin b/src/conf/topology/sklrt286/codec1_out-cpr-5.bin
new file mode 100644 (file)
index 0000000..7a88377
Binary files /dev/null and b/src/conf/topology/sklrt286/codec1_out-cpr-5.bin differ

diff --git a/src/conf/topology/sklrt286/codec1_out-mo.bin b/src/conf/topology/sklrt286/codec1_out-mo.bin
new file mode 100644 (file)
index 0000000..c878060
Binary files /dev/null and b/src/conf/topology/sklrt286/codec1_out-mo.bin differ

diff --git a/src/conf/topology/sklrt286/dmic01_hifi_in-cpr-3.bin b/src/conf/topology/sklrt286/dmic01_hifi_in-cpr-3.bin
new file mode 100644 (file)
index 0000000..4cba682
Binary files /dev/null and b/src/conf/topology/sklrt286/dmic01_hifi_in-cpr-3.bin differ

diff --git a/src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin b/src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin
new file mode 100644 (file)
index 0000000..a7dcd80
Binary files /dev/null and b/src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin differ

diff --git a/src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin b/src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin
new file mode 100644 (file)
index 0000000..9d82fd5
Binary files /dev/null and b/src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin differ

diff --git a/src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin b/src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin
new file mode 100644 (file)
index 0000000..7c866bf
Binary files /dev/null and b/src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin differ

diff --git a/src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin b/src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin
new file mode 100644 (file)
index 0000000..06a8c2a
Binary files /dev/null and b/src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin differ

diff --git a/src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin b/src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin
new file mode 100644 (file)
index 0000000..ff58219
Binary files /dev/null and b/src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin differ

diff --git a/src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin b/src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin
new file mode 100644 (file)
index 0000000..665cf68
Binary files /dev/null and b/src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin differ

diff --git a/src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin b/src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin
new file mode 100644 (file)
index 0000000..3077cb1
Binary files /dev/null and b/src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin differ

diff --git a/src/conf/topology/sklrt286/media0_in-cpr-0.bin b/src/conf/topology/sklrt286/media0_in-cpr-0.bin
new file mode 100644 (file)
index 0000000..4d68d64
Binary files /dev/null and b/src/conf/topology/sklrt286/media0_in-cpr-0.bin differ

diff --git a/src/conf/topology/sklrt286/media0_in-mi.bin b/src/conf/topology/sklrt286/media0_in-mi.bin
new file mode 100644 (file)
index 0000000..5a8005e
Binary files /dev/null and b/src/conf/topology/sklrt286/media0_in-mi.bin differ

diff --git a/src/conf/topology/sklrt286/media0_out-cpr-6.bin b/src/conf/topology/sklrt286/media0_out-cpr-6.bin
new file mode 100644 (file)
index 0000000..ab8c90f
Binary files /dev/null and b/src/conf/topology/sklrt286/media0_out-cpr-6.bin differ

diff --git a/src/conf/topology/sklrt286/media0_out-mo.bin b/src/conf/topology/sklrt286/media0_out-mo.bin
new file mode 100644 (file)
index 0000000..4e22735
Binary files /dev/null and b/src/conf/topology/sklrt286/media0_out-mo.bin differ

diff --git a/src/conf/topology/sklrt286/skl_i2s.conf b/src/conf/topology/sklrt286/skl_i2s.conf
new file mode 100644 (file)
index 0000000..6da224f
--- /dev/null
+++ b/src/conf/topology/sklrt286/skl_i2s.conf
@@ -0,0 +1,342 @@
+SectionData."media0_in cpr 0" {
+       file "sklrt286/media0_in-cpr-0.bin"
+}
+SectionData."media0_in mi" {
+       file "sklrt286/media0_in-mi.bin"
+}
+SectionData."media0_out mo" {
+       file "sklrt286/media0_out-mo.bin"
+}
+SectionData."media0_out cpr 6" {
+       file "sklrt286/media0_out-cpr-6.bin"
+}
+SectionData."codec0_out mo" {
+       file "sklrt286/codec0_out-mo.bin"
+}
+SectionData."codec0_out cpr 4" {
+       file "sklrt286/codec0_out-cpr-4.bin"
+}
+SectionData."codec1_out mo" {
+       file "sklrt286/codec1_out-mo.bin"
+}
+SectionData."codec1_out cpr 5" {
+       file "sklrt286/codec1_out-cpr-5.bin"
+}
+SectionData."codec0_in cpr 1" {
+       file "sklrt286/codec0_in-cpr-1.bin"
+}
+SectionData."codec0_in mi" {
+       file "sklrt286/codec0_in-mi.bin"
+}
+SectionData."dmic01_hifi_in cpr 3" {
+       file "sklrt286/dmic01_hifi_in-cpr-3.bin"
+}
+SectionData."dmic01_hifi_in mi" {
+       file "sklrt286/dmic01_hifi_in-mi.bin"
+}
+SectionData."hdmi1_pt_out cpr 7" {
+       file "sklrt286/hdmi1_pt_out-cpr-7.bin"
+}
+SectionData."hdmi1_pt_out cpr 8" {
+       file "sklrt286/hdmi1_pt_out-cpr-8.bin"
+}
+SectionData."hdmi2_pt_out cpr 9" {
+       file "sklrt286/hdmi2_pt_out-cpr-9.bin"
+}
+SectionData."hdmi2_pt_out cpr 10" {
+       file "sklrt286/hdmi2_pt_out-cpr-10.bin"
+}
+SectionData."hdmi3_pt_out cpr 11" {
+       file "sklrt286/hdmi3_pt_out-cpr-11.bin"
+}
+SectionData."hdmi3_pt_out cpr 12" {
+       file "sklrt286/hdmi3_pt_out-cpr-12.bin"
+}
+
+SectionControlMixer."media0_in mi Switch" {
+       index"1"
+       invert "false"
+       max "1"
+       min"0"
+       no_pm "true"
+       channel."fl" {
+               reg "-1"
+               shift "0"
+       }
+       channel."fr" {
+               reg "-1"
+               shift "0"
+       }
+       ops."ctl" {
+               get "64"
+               put "64"
+               info "64"
+       }
+}
+SectionControlMixer."codec0_in mi Switch" {
+       index"1"
+       invert "false"
+       max "1"
+       min"0"
+       no_pm "true"
+       channel."fl" {
+               reg "-1"
+               shift "0"
+       }
+       channel."fr" {
+               reg "-1"
+               shift "0"
+       }
+       ops."ctl" {
+               get "64"
+               put "64"
+               info "64"
+       }
+}
+SectionControlMixer."dmic01_hifi_in mi Switch" {
+       index"1"
+       invert "false"
+       max "1"
+       min"0"
+       no_pm "true"
+       channel."fl" {
+               reg "-1"
+               shift "0"
+       }
+       channel."fr" {
+               reg "-1"
+               shift "0"
+       }
+       ops."ctl" {
+               get "64"
+               put "64"
+               info "64"
+       }
+}
+
+
+SectionWidget."media0_in cpr 0" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "3"
+       event_flags "9"
+       data "media0_in cpr 0"
+}
+SectionWidget."media0_in mi" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       event_flags "9"
+       subseq "10"
+       data "media0_in mi"
+}
+SectionWidget."media0_out mo" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "1"
+       event_flags "15"
+       subseq "10"
+       data "media0_out mo"
+       mixer [
+               "media0_in mi Switch"
+               "codec0_in mi Switch"
+               "dmic01_hifi_in mi Switch"
+       ]
+}
+SectionWidget."media0_out cpr 6" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       data "media0_out cpr 6"
+}
+SectionWidget."codec0_out mo" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "1"
+       event_flags "15"
+       subseq "10"
+       data "codec0_out mo"
+       mixer [
+               "media0_in mi Switch"
+               "codec0_in mi Switch"
+               "dmic01_hifi_in mi Switch"
+       ]
+}
+SectionWidget."codec0_out cpr 4" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       data "codec0_out cpr 4"
+}
+SectionWidget."codec0_out" {
+       index"1"
+       type"aif_out"
+       no_pm "true"
+}
+SectionWidget."codec1_out mo" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "1"
+       event_flags "15"
+       subseq "10"
+       data "codec1_out mo"
+       mixer [
+               "media0_in mi Switch"
+               "codec0_in mi Switch"
+               "dmic01_hifi_in mi Switch"
+       ]
+}
+SectionWidget."codec1_out cpr 5" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       data "codec1_out cpr 5"
+}
+SectionWidget."codec1_out" {
+       index"1"
+       type"aif_out"
+       no_pm "true"
+}
+SectionWidget."codec0_in cpr 1" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "3"
+       event_flags "9"
+       data "codec0_in cpr 1"
+}
+SectionWidget."codec0_in mi" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       event_flags "9"
+       subseq "10"
+       data "codec0_in mi"
+}
+SectionWidget."codec0_in" {
+       index"1"
+       type"aif_in"
+       no_pm "true"
+}
+SectionWidget."dmic01_hifi_in cpr 3" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "3"
+       event_flags "9"
+       data "dmic01_hifi_in cpr 3"
+}
+SectionWidget."dmic01_hifi_in mi" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       event_flags "9"
+       subseq "10"
+       data "dmic01_hifi_in mi"
+}
+SectionWidget."dmic01_hifi" {
+       index"1"
+       type"aif_in"
+       no_pm "true"
+}
+SectionWidget."hdmi1_pt_out cpr 7" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "3"
+       event_flags "9"
+       data "hdmi1_pt_out cpr 7"
+}
+SectionWidget."hdmi1_pt_out cpr 8" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       data "hdmi1_pt_out cpr 8"
+}
+SectionWidget."iDisp1_out" {
+       index"1"
+       type"aif_out"
+       no_pm "true"
+}
+SectionWidget."hdmi2_pt_out cpr 9" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "3"
+       event_flags "9"
+       data "hdmi2_pt_out cpr 9"
+}
+SectionWidget."hdmi2_pt_out cpr 10" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       data "hdmi2_pt_out cpr 10"
+}
+SectionWidget."iDisp2_out" {
+       index"1"
+       type"aif_out"
+       no_pm "true"
+}
+SectionWidget."hdmi3_pt_out cpr 11" {
+       index"1"
+       type"mixer"
+       no_pm "true"
+       event_type "3"
+       event_flags "9"
+       data "hdmi3_pt_out cpr 11"
+}
+SectionWidget."hdmi3_pt_out cpr 12" {
+       index"1"
+       type"pga"
+       no_pm "true"
+       event_type "4"
+       data "hdmi3_pt_out cpr 12"
+}
+SectionGraph."Pipeline 1 Graph" {
+       index"1"
+       lines [
+               "media0_in mi, , media0_in cpr 0"
+               "media0_in cpr 0, , System Playback"
+               "media0_out mo, media0_in mi Switch, media0_in mi"
+               "media0_out mo, codec0_in mi Switch, codec0_in mi"
+               "media0_out mo, dmic01_hifi_in mi Switch, dmic01_hifi_in mi"
+               "media0_out cpr 6, , media0_out mo"
+               "System Capture, , media0_out cpr 6"
+               "codec0_out mo, media0_in mi Switch, media0_in mi"
+               "codec0_out mo, codec0_in mi Switch, codec0_in mi"
+               "codec0_out mo, dmic01_hifi_in mi Switch, dmic01_hifi_in mi"
+               "codec0_out cpr 4, , codec0_out mo"
+               "codec0_out, , codec0_out cpr 4"
+               "codec1_out mo, media0_in mi Switch, media0_in mi"
+               "codec1_out mo, codec0_in mi Switch, codec0_in mi"
+               "codec1_out mo, dmic01_hifi_in mi Switch, dmic01_hifi_in mi"
+               "codec1_out cpr 5, , codec1_out mo"
+               "codec1_out, , codec1_out cpr 5"
+               "codec0_in mi, , codec0_in cpr 1"
+               "codec0_in cpr 1, , codec0_in"
+               "dmic01_hifi_in mi, , dmic01_hifi_in cpr 3"
+               "dmic01_hifi_in cpr 3, , dmic01_hifi"
+               "hdmi1_pt_out cpr 8, , hdmi1_pt_out cpr 7"
+               "hdmi1_pt_out cpr 7, , HDMI1 Playback"
+               "iDisp1_out, , hdmi1_pt_out cpr 8"
+               "hdmi2_pt_out cpr 10, , hdmi2_pt_out cpr 9"
+               "hdmi2_pt_out cpr 9, , HDMI2 Playback"
+               "iDisp2_out, , hdmi2_pt_out cpr 10"
+               "hdmi3_pt_out cpr 12, , hdmi3_pt_out cpr 11"
+               "hdmi3_pt_out cpr 11, , HDMI3 Playback"
+               "iDisp1_out, , hdmi3_pt_out cpr 12"
+       ]
+}
+