diff options
-rw-r--r-- | include/uapi/sound/snd_sst_tokens.h | 5 | ||||
-rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 4 | ||||
-rw-r--r-- | sound/soc/intel/skylake/skl-topology.h | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/uapi/sound/snd_sst_tokens.h b/include/uapi/sound/snd_sst_tokens.h index 89b82f6256ad..dedb2056160d 100644 --- a/include/uapi/sound/snd_sst_tokens.h +++ b/include/uapi/sound/snd_sst_tokens.h | |||
@@ -161,6 +161,8 @@ | |||
161 | * | 161 | * |
162 | * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module | 162 | * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module |
163 | * | 163 | * |
164 | * %SKL_TKN_U32_DMA_BUF_SIZE: DMA buffer size in millisec | ||
165 | * | ||
164 | * module_id and loadable flags dont have tokens as these values will be | 166 | * module_id and loadable flags dont have tokens as these values will be |
165 | * read from the DSP FW manifest | 167 | * read from the DSP FW manifest |
166 | */ | 168 | */ |
@@ -215,7 +217,8 @@ enum SKL_TKNS { | |||
215 | SKL_TKN_U32_PMODE, | 217 | SKL_TKN_U32_PMODE, |
216 | SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */ | 218 | SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */ |
217 | SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS, | 219 | SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS, |
218 | SKL_TKN_MAX = SKL_TKN_U32_D0I3_CAPS, | 220 | SKL_TKN_U32_DMA_BUF_SIZE, |
221 | SKL_TKN_MAX = SKL_TKN_U32_DMA_BUF_SIZE, | ||
219 | }; | 222 | }; |
220 | 223 | ||
221 | #endif | 224 | #endif |
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 212cee71d586..9569f118e97e 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c | |||
@@ -2212,6 +2212,10 @@ static int skl_tplg_get_token(struct device *dev, | |||
2212 | 2212 | ||
2213 | break; | 2213 | break; |
2214 | 2214 | ||
2215 | case SKL_TKN_U32_DMA_BUF_SIZE: | ||
2216 | mconfig->dma_buffer_size = tkn_elem->value; | ||
2217 | break; | ||
2218 | |||
2215 | case SKL_TKN_U8_IN_PIN_TYPE: | 2219 | case SKL_TKN_U8_IN_PIN_TYPE: |
2216 | case SKL_TKN_U8_OUT_PIN_TYPE: | 2220 | case SKL_TKN_U8_OUT_PIN_TYPE: |
2217 | case SKL_TKN_U8_CONN_TYPE: | 2221 | case SKL_TKN_U8_CONN_TYPE: |
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index 3f51a0a00093..c25e8868b84e 100644 --- a/sound/soc/intel/skylake/skl-topology.h +++ b/sound/soc/intel/skylake/skl-topology.h | |||
@@ -321,6 +321,7 @@ struct skl_module_cfg { | |||
321 | u32 vbus_id; | 321 | u32 vbus_id; |
322 | u32 mem_pages; | 322 | u32 mem_pages; |
323 | enum d0i3_capability d0i3_caps; | 323 | enum d0i3_capability d0i3_caps; |
324 | u32 dma_buffer_size; /* in milli seconds */ | ||
324 | struct skl_module_pin *m_in_pin; | 325 | struct skl_module_pin *m_in_pin; |
325 | struct skl_module_pin *m_out_pin; | 326 | struct skl_module_pin *m_out_pin; |
326 | enum skl_module_type m_type; | 327 | enum skl_module_type m_type; |