Skip to contentSkip to conversation

: conf: topology: Add the conf for SKL-rt286

PATCH In review Vinod Koul 2 participants 5 messages Apr 28, 2016 – May 2, 2016 Sound

lore
Share & tools
lore

Vinod Koul

author
#0 lore raw

v4 cover : conf: topology: Add the conf for SKL-rt286

This series adds SKL-i2c conf for simple PCM topology graph

Changes in v4:
- add back the pre-compiled binary blobs
- remove running the binary on intsall step

Changes in v3:

- remove bin blobs, now they are generated in install step
- hook the tool compilation to alsa-lib and run it on install
- add u8 in alsa type_compat.h

Shreyas NC (3):
conf: topology: Add Skylake i2s conf
Add u8 in type_compat.h
conf: topology: Generate Private data binary blobs

 configure.ac                                       |    2 +
 include/sound/type_compat.h                        |    2 +
 src/conf/topology/Makefile.am                      |    2 +-
 src/conf/topology/sklrt286/Makefile.am             |    5 +
 src/conf/topology/sklrt286/codec0_in-cpr-1.bin     |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec0_in-mi.bin        |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec0_out-cpr-4.bin    |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec0_out-mo.bin       |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec1_out-cpr-5.bin    |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec1_out-mo.bin       |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/data/Makefile.am        |    4 +
 src/conf/topology/sklrt286/data/pvt.c              | 1815 ++++++++++++++++++++
 src/conf/topology/sklrt286/data/pvt_data.c         |   90 +
 src/conf/topology/sklrt286/data/pvt_local.h        |    9 +
 .../topology/sklrt286/data/skl-tplg-interface.h    |  232 +++
 .../topology/sklrt286/dmic01_hifi_in-cpr-3.bin     |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin   |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin  |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin  |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin  |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/media0_in-cpr-0.bin     |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/media0_in-mi.bin        |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/media0_out-cpr-6.bin    |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/media0_out-mo.bin       |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/skl_i2s.conf            |  342 ++++
 28 files changed, 2502 insertions(+), 1 deletion(-)
 create mode 100644 src/conf/topology/sklrt286/Makefile.am
 create mode 100644 src/conf/topology/sklrt286/codec0_in-cpr-1.bin
 create mode 100644 src/conf/topology/sklrt286/codec0_in-mi.bin
 create mode 100644 src/conf/topology/sklrt286/codec0_out-cpr-4.bin
 create mode 100644 src/conf/topology/sklrt286/codec0_out-mo.bin
 create mode 100644 src/conf/topology/sklrt286/codec1_out-cpr-5.bin
 create mode 100644 src/conf/topology/sklrt286/codec1_out-mo.bin
 create mode 100644 src/conf/topology/sklrt286/data/Makefile.am
 create mode 100644 src/conf/topology/sklrt286/data/pvt.c
 create mode 100644 src/conf/topology/sklrt286/data/pvt_data.c
 create mode 100644 src/conf/topology/sklrt286/data/pvt_local.h
 create mode 100644 src/conf/topology/sklrt286/data/skl-tplg-interface.h
 create mode 100644 src/conf/topology/sklrt286/dmic01_hifi_in-cpr-3.bin
 create mode 100644 src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin
 create mode 100644 src/conf/topology/sklrt286/media0_in-cpr-0.bin
 create mode 100644 src/conf/topology/sklrt286/media0_in-mi.bin
 create mode 100644 src/conf/topology/sklrt286/media0_out-cpr-6.bin
 create mode 100644 src/conf/topology/sklrt286/media0_out-mo.bin
 create mode 100644 src/conf/topology/sklrt286/skl_i2s.conf
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v4 2/3 Add u8 in type_compat.h

From: Shreyas NC <[email protected]>

Skylake headers use u8 data types which were not present in type_compat so add them.

---
 include/sound/type_compat.h | 2 ++
 1 file changed, 2 insertions(+)
include/sound/type_compat.h +2 -0
index eec86e4bc41e..e973ff3139e2 100644
@@ -32,9 +32,11 @@ typedef int32_t __s32;
 #define __le64 __u64
 #define __le32 __u32
 #define __le16 __u16
+#define __le8  __u8
 #define __be64 __u64
 #define __be32 __u32
 #define __be16 __u16
+#define __be8  __u8
 #endif /* DOC_HIDDEN */
 
 #endif /* __TYPE_COMPAT_H */
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH v4 3/3 conf: topology: Generate Private data binary blobs

In reply to Vinod Koul

From: Shreyas NC <[email protected]>

The DSP modules need private data and that is provided as binary blob. These blobs are compiled from C structures which specify module configuration.

---
 configure.ac                                       |    1 +
 src/conf/topology/sklrt286/data/Makefile.am        |    4 +
 src/conf/topology/sklrt286/data/pvt.c              | 1815 ++++++++++++++++++++
 src/conf/topology/sklrt286/data/pvt_data.c         |   90 +
 src/conf/topology/sklrt286/data/pvt_local.h        |    9 +
 .../topology/sklrt286/data/skl-tplg-interface.h    |  232 +++
 6 files changed, 2151 insertions(+)
 create mode 100644 src/conf/topology/sklrt286/data/Makefile.am
 create mode 100644 src/conf/topology/sklrt286/data/pvt.c
 create mode 100644 src/conf/topology/sklrt286/data/pvt_data.c
 create mode 100644 src/conf/topology/sklrt286/data/pvt_local.h
 create mode 100644 src/conf/topology/sklrt286/data/skl-tplg-interface.h
configure.ac +1 -0
index 1bf75e6d9c2b..28fcd24a883d 100644
@@ -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/data/Makefile \
 	  src/conf/topology/sklrt286/Makefile \
 	  alsalisp/Makefile aserver/Makefile \
 	  test/Makefile test/lsb/Makefile \
src/conf/topology/sklrt286/data/Makefile.am new file +4 -0
new file mode 100644
index 000000000000..888ce16e0208
@@ -0,0 +1,4 @@
+noinst_PROGRAMS = pvt_data
+pvt_data_SOURCES = pvt_data.c
+AM_CPPFLAGS = \
+         -Wall -I$(top_srcdir)/include
src/conf/topology/sklrt286/data/pvt.c new file +1815 -0

1,815 lines not on this page · raw message

src/conf/topology/sklrt286/data/pvt_data.c new file +90 -0

90 lines not on this page · raw message

src/conf/topology/sklrt286/data/pvt_local.h new file +9 -0
new file mode 100644
index 000000000000..5edf7bd71ce9
@@ -0,0 +1,9 @@
+#include <stdio.h>
+#include "skl-tplg-interface.h"
+
+struct skl_dfw_module_mod {
+	char name[100];
+	struct skl_dfw_module skl_dfw_mod;
+};
+
+
src/conf/topology/sklrt286/data/skl-tplg-interface.h new file +232 -0

232 lines not on this page · raw message

Signature · 1 line
1.9.1
#3 lore raw
In reply to Vinod Koul
Quoted 9 lines · Vinod Koul

This series adds SKL-i2c conf for simple PCM topology graph

Changes in v4:
- add back the pre-compiled binary blobs
- remove running the binary on intsall step

Changes in v3:

Quoted 8 lines

- remove bin blobs, now they are generated in install step
- hook the tool compilation to alsa-lib and run it on install
- add u8 in alsa type_compat.h

Shreyas NC (3):
conf: topology: Add Skylake i2s conf
Add u8 in type_compat.h
conf: topology: Generate Private data binary blobs

Applied now (with a slight fix for git bisection and adding the missing .gitignore).

thanks,

Takashi

Quoted 59 lines
 configure.ac                                       |    2 +
 include/sound/type_compat.h                        |    2 +
 src/conf/topology/Makefile.am                      |    2 +-
 src/conf/topology/sklrt286/Makefile.am             |    5 +
 src/conf/topology/sklrt286/codec0_in-cpr-1.bin     |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec0_in-mi.bin        |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec0_out-cpr-4.bin    |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec0_out-mo.bin       |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec1_out-cpr-5.bin    |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/codec1_out-mo.bin       |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/data/Makefile.am        |    4 +
 src/conf/topology/sklrt286/data/pvt.c              | 1815 ++++++++++++++++++++
 src/conf/topology/sklrt286/data/pvt_data.c         |   90 +
 src/conf/topology/sklrt286/data/pvt_local.h        |    9 +
 .../topology/sklrt286/data/skl-tplg-interface.h    |  232 +++
 .../topology/sklrt286/dmic01_hifi_in-cpr-3.bin     |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin   |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin  |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin  |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin  |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/media0_in-cpr-0.bin     |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/media0_in-mi.bin        |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/media0_out-cpr-6.bin    |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/media0_out-mo.bin       |  Bin 0 -> 4244 bytes
 src/conf/topology/sklrt286/skl_i2s.conf            |  342 ++++
 28 files changed, 2502 insertions(+), 1 deletion(-)
 create mode 100644 src/conf/topology/sklrt286/Makefile.am
 create mode 100644 src/conf/topology/sklrt286/codec0_in-cpr-1.bin
 create mode 100644 src/conf/topology/sklrt286/codec0_in-mi.bin
 create mode 100644 src/conf/topology/sklrt286/codec0_out-cpr-4.bin
 create mode 100644 src/conf/topology/sklrt286/codec0_out-mo.bin
 create mode 100644 src/conf/topology/sklrt286/codec1_out-cpr-5.bin
 create mode 100644 src/conf/topology/sklrt286/codec1_out-mo.bin
 create mode 100644 src/conf/topology/sklrt286/data/Makefile.am
 create mode 100644 src/conf/topology/sklrt286/data/pvt.c
 create mode 100644 src/conf/topology/sklrt286/data/pvt_data.c
 create mode 100644 src/conf/topology/sklrt286/data/pvt_local.h
 create mode 100644 src/conf/topology/sklrt286/data/skl-tplg-interface.h
 create mode 100644 src/conf/topology/sklrt286/dmic01_hifi_in-cpr-3.bin
 create mode 100644 src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin
 create mode 100644 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin
 create mode 100644 src/conf/topology/sklrt286/media0_in-cpr-0.bin
 create mode 100644 src/conf/topology/sklrt286/media0_in-mi.bin
 create mode 100644 src/conf/topology/sklrt286/media0_out-cpr-6.bin
 create mode 100644 src/conf/topology/sklrt286/media0_out-mo.bin
 create mode 100644 src/conf/topology/sklrt286/skl_i2s.conf
Signature · 1 line
1.9.1
author
#4 lore raw
Quoted 15 lines · Takashi Iwai
Quoted 13 lines · Vinod Koul

This series adds SKL-i2c conf for simple PCM topology graph

Changes in v4:
- add back the pre-compiled binary blobs
- remove running the binary on intsall step

Changes in v3:

- remove bin blobs, now they are generated in install step
- hook the tool compilation to alsa-lib and run it on install
- add u8 in alsa type_compat.h

Quoted 7 lines
Quoted 4 lines

Shreyas NC (3):
conf: topology: Add Skylake i2s conf
Add u8 in type_compat.h
conf: topology: Generate Private data binary blobs

Applied now (with a slight fix for git bisection and adding the missing .gitignore).

Thanks a bunch :)

Signature · 1 line
~Vinod