Skip to content

Commit 1dd1b27

Browse files
lyakhkv2019i
authored andcommitted
volume: move gain.toml and peakvol.toml into volume.toml
To make volume an LLEXT module it should have a single TOML configuration file named volume.toml. This is easy to do, using respective Kconfig options. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent cfd27fb commit 1dd1b27

6 files changed

Lines changed: 77 additions & 84 deletions

File tree

src/audio/volume/gain.toml

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/audio/volume/peakvol.toml

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/audio/volume/volume.toml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
#if CONFIG_COMP_PEAK_VOL
2+
[[module.entry]]
3+
name = "PEAKVOL"
4+
uuid = "8A171323-94A3-4E1D-AFE9-FE5DBAA4C393"
5+
affinity_mask = "0x1"
6+
instance_count = "10"
7+
domain_types = "0"
8+
load_type = "0"
9+
module_type = "4"
10+
auto_start = "0"
11+
sched_caps = [1, 0x00008000]
12+
13+
REM # pin = [dir, type, sample rate, size, container, channel-cfg]
14+
pin = [0, 0, 0xfeef, 0xf, 0xa, 0x45ff,
15+
1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
16+
17+
REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
18+
#if CONFIG_METEORLAKE
19+
mod_cfg = [1, 0, 0, 0, 480, 11667000, 384, 384, 0, 11667, 0,
20+
2, 0, 0, 0, 480, 5943000, 192, 192, 0, 5943, 0,
21+
3, 0, 0, 0, 480, 12567000, 720, 720, 0, 12567, 0,
22+
4, 0, 0, 0, 480, 7360000, 768, 768, 0, 7360, 0,
23+
5, 0, 0, 0, 480, 12236000, 1536, 1536, 0, 12236, 0]
24+
#elif CONFIG_LUNARLAKE || CONFIG_PANTHERLAKE
25+
mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0,
26+
1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0,
27+
2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0,
28+
3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0,
29+
4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0,
30+
5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0,
31+
6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0]
32+
#endif
33+
34+
index = __COUNTER__
35+
#endif
36+
37+
#if CONFIG_COMP_GAIN
38+
[[module.entry]]
39+
name = "GAIN"
40+
uuid = "61BCA9A8-18D0-4A18-8E7B-2639219804B7"
41+
affinity_mask = "0x1"
42+
instance_count = "40"
43+
domain_types = "0"
44+
load_type = "0"
45+
module_type = "9"
46+
auto_start = "0"
47+
sched_caps = [1, 0x00008000]
48+
49+
REM # pin = [dir, type, sample rate, size, container, channel-cfg]
50+
pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff,
51+
1, 0, 0xfeef, 0xf, 0xf, 0x45ff]
52+
53+
REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
54+
#if CONFIG_METEORLAKE
55+
mod_cfg = [1, 0, 0, 0, 416, 12100000, 1536, 1536, 0, 12100, 0,
56+
2, 0, 0, 0, 416, 10183000, 384, 384, 0, 10183, 0,
57+
3, 0, 0, 0, 416, 8192000, 512, 512, 0, 8192, 0,
58+
4, 0, 0, 0, 416, 10091000, 128, 128, 0, 10091, 0,
59+
5, 0, 0, 0, 416, 5908000, 768, 768, 0, 5908, 0]
60+
#elif CONFIG_LUNARLAKE || CONFIG_PANTHERLAKE
61+
mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0,
62+
1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0,
63+
2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0,
64+
3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0,
65+
4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0,
66+
5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0,
67+
6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0]
68+
#endif
69+
70+
index = __COUNTER__
71+
#endif

tools/rimage/config/lnl.toml.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@
3232
#include <audio/copier/copier.toml>
3333
#endif
3434

35-
#ifdef CONFIG_COMP_PEAK_VOL
36-
#include <audio/volume/peakvol.toml>
37-
#endif
38-
39-
#ifdef CONFIG_COMP_GAIN
40-
#include <audio/volume/gain.toml>
35+
#ifdef CONFIG_COMP_VOLUME
36+
#include <audio/volume/volume.toml>
4137
#endif
4238

4339
#ifdef CONFIG_COMP_ASRC

tools/rimage/config/mtl.toml.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@
3232
#include <audio/copier/copier.toml>
3333
#endif
3434

35-
#ifdef CONFIG_COMP_PEAK_VOL
36-
#include <audio/volume/peakvol.toml>
37-
#endif
38-
39-
#ifdef CONFIG_COMP_GAIN
40-
#include <audio/volume/gain.toml>
35+
#ifdef CONFIG_COMP_VOLUME
36+
#include <audio/volume/volume.toml>
4137
#endif
4238

4339
#ifdef CONFIG_COMP_ASRC

tools/rimage/config/ptl.toml.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ index = __COUNTER__
3232
#include <audio/copier/copier.toml>
3333
#endif
3434

35-
#ifdef CONFIG_COMP_PEAK_VOL
36-
#include <audio/volume/peakvol.toml>
37-
#endif
38-
39-
#ifdef CONFIG_COMP_GAIN
40-
#include <audio/volume/gain.toml>
35+
#ifdef CONFIG_COMP_VOLUME
36+
#include <audio/volume/volume.toml>
4137
#endif
4238

4339
#ifdef CONFIG_COMP_ASRC

0 commit comments

Comments
 (0)