Add virtual widgets and routes to make it aligned with machine driver.

Signed-off-by: Keyon Jie yang.jie@linux.intel.com --- Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 0de0fcb1d077c3c2c3b06a6c64e85f14b7e75c0b SOF master: e5dab2ada6ef98dbc6224863110cc86b5839ea01 Tool master: b4f3670870ba5a933c3ec58a51b59ff9ef8b3588 --- topology/sof-apl-tdf8532.m4 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)

diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 index 1ff0a0d..11299cd 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -87,3 +87,27 @@ DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16, DAI_CLOCK(bclk, 1536000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(2, 16, 3, 3)) + +VIRTUAL_DAPM_ROUTE_IN(BtHfp_ssp0_in, SSP, 0, IN, 0) +VIRTUAL_DAPM_ROUTE_OUT(BtHfp_ssp0_out, SSP, 0, OUT, 1) +VIRTUAL_DAPM_ROUTE_IN(hdmi_ssp1_in, SSP, 1, IN, 2) +VIRTUAL_DAPM_ROUTE_IN(dirana_in, SSP, 2, IN, 3) +VIRTUAL_DAPM_ROUTE_IN(dirana_aux_in, SSP, 2, IN, 4) +VIRTUAL_DAPM_ROUTE_IN(dirana_tuner_in, SSP, 2, IN, 5) +VIRTUAL_DAPM_ROUTE_OUT(dirana_out, SSP, 2, OUT, 6) +VIRTUAL_DAPM_ROUTE_IN(Modem_ssp3_in, SSP, 3, IN, 7) +VIRTUAL_DAPM_ROUTE_OUT(Modem_ssp3_out, SSP, 3, OUT, 8) +VIRTUAL_DAPM_ROUTE_OUT(codec0_out, SSP, 4, OUT, 9) +VIRTUAL_DAPM_ROUTE_IN(TestPin_ssp5_in, SSP, 5, IN, 10) +VIRTUAL_DAPM_ROUTE_OUT(TestPin_ssp5_out, SSP, 5, OUT, 11) +VIRTUAL_WIDGET(ssp0 Tx, 12) +VIRTUAL_WIDGET(ssp0 Rx, 13) +VIRTUAL_WIDGET(ssp1 Rx, 14) +VIRTUAL_WIDGET(ssp2 Tx, 15) +VIRTUAL_WIDGET(ssp2 Rx, 16) +VIRTUAL_WIDGET(ssp3 Tx, 17) +VIRTUAL_WIDGET(ssp3 Rx, 18) +VIRTUAL_WIDGET(ssp4 Tx, 19) +VIRTUAL_WIDGET(ssp5 Tx, 20) +VIRTUAL_WIDGET(ssp5 Rx, 21) +

On 2018年05月24日 10:14, Keyon Jie wrote:

This means they won't be sent to firmware for components creation.

Signed-off-by: Keyon Jie yang.jie@linux.intel.com

Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 0de0fcb1d077c3c2c3b06a6c64e85f14b7e75c0b SOF master: e5dab2ada6ef98dbc6224863110cc86b5839ea01 Tool master: b4f3670870ba5a933c3ec58a51b59ff9ef8b3588

Hi Rander, I didn't test this for cnl-rt274 yet, can you help check if this will break the virtual widgets and routes on cnl-rt274?

Thanks, ~Keyon

---

topology/m4/utils.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/topology/m4/utils.m4 b/topology/m4/utils.m4 index 8b397b6..73faae6 100644 --- a/topology/m4/utils.m4 +++ b/topology/m4/utils.m4 @@ -74,7 +74,7 @@ dnl VIRTUAL_DAPM_ROUTE_OUT(name, dai type, dai index, direction, index) define(`VIRTUAL_DAPM_ROUTE_OUT', `SectionWidget.STR($1) {' ` index STR($5)' -` type "aif_out"' +` type "output"' ` no_pm "true"' `}' `SectionGraph.STR($2) {' @@ -89,7 +89,7 @@ dnl VIRTUAL_DAPM_ROUTE_IN(name, dai type, dai index, direction, index) define(`VIRTUAL_DAPM_ROUTE_IN', `SectionWidget.STR($1) {' ` index STR($5)' -` type "aif_in"' +` type "input"' ` no_pm "true"' `}' `SectionGraph.STR($2) {' @@ -104,7 +104,7 @@ dnl VIRTUAL_WIDGET(name, index) define(`VIRTUAL_WIDGET', `SectionWidget.STR($1) {' ` index STR($2)' -` type "mixer"' +` type "out_drv"' ` no_pm "true"' `}')