Skip to contentSkip to conversation

conf: Add vendor tuples in conf

PATCH RESEND New Vinod Koul 1 participant 3 messages Aug 23, 2016

lore
Share & tools
lore

Vinod Koul

author
#0 lore raw

cover conf: Add vendor tuples in conf

Topology changes in alsa-lib allow driver data for modules to be be passed in topology conf file using tuples. These changes allow private data to represented by tuples of type UUID, byte, short, word and strings.

This patch series adds changes to :
- include tuple and token list in the conf file
to define module private data.
- Private data blobs for modules are no longer required. So, remove the binary blobs and the tool used to generate the blobs.
- Then add bxt conf file which is based on tuples

Shreyas NC (3):
conf: sklrt286: define module private data through tuples in skylake
conf: sklrt286: Remove tool to generate private data blobs
conf: bxtrt298: Add topology conf file for bxt

 configure.ac                                       |    2 +-
 src/conf/topology/Makefile.am                      |    2 +-
 src/conf/topology/bxtrt298/Makefile.am             |    4 +
 src/conf/topology/bxtrt298/bxt_i2s.conf            | 3323 ++++++++++++++++++++
 src/conf/topology/sklrt286/Makefile.am             |    3 +-
 src/conf/topology/sklrt286/codec0_in-cpr-1.bin     |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/codec0_in-mi.bin        |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/codec0_out-cpr-4.bin    |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/codec0_out-mo.bin       |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/codec1_out-cpr-5.bin    |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/codec1_out-mo.bin       |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/data/Makefile.am        |    6 -
 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 4244 -> 0 bytes
 src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin   |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin  |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin  |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin  |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/media0_in-cpr-0.bin     |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/media0_in-mi.bin        |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/media0_out-cpr-6.bin    |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/media0_out-mo.bin       |  Bin 4244 -> 0 bytes
 src/conf/topology/sklrt286/skl_i2s.conf            | 2694 +++++++++++++++-
 29 files changed, 5988 insertions(+), 2192 deletions(-)
 create mode 100644 src/conf/topology/bxtrt298/Makefile.am
 create mode 100644 src/conf/topology/bxtrt298/bxt_i2s.conf
 delete mode 100644 src/conf/topology/sklrt286/codec0_in-cpr-1.bin
 delete mode 100644 src/conf/topology/sklrt286/codec0_in-mi.bin
 delete mode 100644 src/conf/topology/sklrt286/codec0_out-cpr-4.bin
 delete mode 100644 src/conf/topology/sklrt286/codec0_out-mo.bin
 delete mode 100644 src/conf/topology/sklrt286/codec1_out-cpr-5.bin
 delete mode 100644 src/conf/topology/sklrt286/codec1_out-mo.bin
 delete mode 100644 src/conf/topology/sklrt286/data/Makefile.am
 delete mode 100644 src/conf/topology/sklrt286/data/pvt.c
 delete mode 100644 src/conf/topology/sklrt286/data/pvt_data.c
 delete mode 100644 src/conf/topology/sklrt286/data/pvt_local.h
 delete mode 100644 src/conf/topology/sklrt286/data/skl-tplg-interface.h
 delete mode 100644 src/conf/topology/sklrt286/dmic01_hifi_in-cpr-3.bin
 delete mode 100644 src/conf/topology/sklrt286/dmic01_hifi_in-mi.bin
 delete mode 100644 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-7.bin
 delete mode 100644 src/conf/topology/sklrt286/hdmi1_pt_out-cpr-8.bin
 delete mode 100644 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-10.bin
 delete mode 100644 src/conf/topology/sklrt286/hdmi2_pt_out-cpr-9.bin
 delete mode 100644 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-11.bin
 delete mode 100644 src/conf/topology/sklrt286/hdmi3_pt_out-cpr-12.bin
 delete mode 100644 src/conf/topology/sklrt286/media0_in-cpr-0.bin
 delete mode 100644 src/conf/topology/sklrt286/media0_in-mi.bin
 delete mode 100644 src/conf/topology/sklrt286/media0_out-cpr-6.bin
 delete mode 100644 src/conf/topology/sklrt286/media0_out-mo.bin
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH RESEND 1/3 conf: sklrt286: define module private data through tuples in skylake

From: Shreyas NC <[email protected]>

In the conf file, module private data can be described through tuples instead of blobs defined by vendor defined structures.

This patch defines the tuple section and the token list. The tokens are then used to build the tuple array.

The module data may have both driver data and firmware data. The driver data is passed using the tuple array and the firmware data using byte data. A descriptor tuple array is defined to describe the succeeding data block.

---
 src/conf/topology/sklrt286/Makefile.am  |    2 +-
 src/conf/topology/sklrt286/skl_i2s.conf | 2694 ++++++++++++++++++++++++++++++-
 2 files changed, 2659 insertions(+), 37 deletions(-)
src/conf/topology/sklrt286/Makefile.am +1 -1
index ed58b775e6eb..4e7a9d017b62 100644
@@ -1,5 +1,5 @@
 alsaconfigdir = @ALSA_CONFIG_DIR@
 SUBDIRS = data
 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 
+sklrt286_DATA = skl_i2s.conf
 EXTRA_DIST = $(sklrt286_DATA)
src/conf/topology/sklrt286/skl_i2s.conf +2658 -36

2,842 lines not on this page · raw message

Signature · 1 line
1.9.1
author
#2 lore raw

PATCH RESEND 3/3 conf: bxtrt298: Add topology conf file for bxt

In reply to Vinod Koul

From: Shreyas NC <[email protected]>

Add the conf file for bxt platform as well to define module private data.

---
 configure.ac                            |    1 +
 src/conf/topology/Makefile.am           |    2 +-
 src/conf/topology/bxtrt298/Makefile.am  |    4 +
 src/conf/topology/bxtrt298/bxt_i2s.conf | 3323 +++++++++++++++++++++++++++++++
 4 files changed, 3329 insertions(+), 1 deletion(-)
 create mode 100644 src/conf/topology/bxtrt298/Makefile.am
 create mode 100644 src/conf/topology/bxtrt298/bxt_i2s.conf
configure.ac +1 -0
index 6de8efea3b7c..a1de230e588c 100644
@@ -680,6 +680,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
 	  src/conf/topology/broadwell/Makefile \
 	  modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
 	  src/conf/topology/sklrt286/Makefile \
+	  src/conf/topology/bxtrt298/Makefile \
 	  alsalisp/Makefile aserver/Makefile \
 	  test/Makefile test/lsb/Makefile \
 	  utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
src/conf/topology/Makefile.am +1 -1
index cbdb7cf07c97..8adaed903053 100644
@@ -1 +1 @@
-SUBDIRS=broadwell sklrt286
+SUBDIRS=broadwell sklrt286 bxtrt298
src/conf/topology/bxtrt298/Makefile.am new file +4 -0
new file mode 100644
index 000000000000..152d5cff4fc4
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+bxtrt298dir = $(alsaconfigdir)/topology/bxtrt298
+bxtrt298_DATA = bxt_i2s.conf
+EXTRA_DIST = $(bxtrt298_DATA)
src/conf/topology/bxtrt298/bxt_i2s.conf new file +3323 -0

2,987 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.9.1

Part of the diff is not shown here. View the raw message.