[Sound-open-firmware] [PATCH 1/2] topology: enable ssp2 for capture feature.
the ssp2 should be tdm8-32bit.
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com --- topology/sof-apl-tdf8532.m4 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 index 5554e58..2a63943 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -38,19 +38,19 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4, 1, 0, 4, s32le, 48, 1000, 0, 0, 0, 1, SSP, 4, s32le, 2)
-# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s16le. +# Low Latency playback pipeline 2 on PCM 1 using max 8 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data +# Use DMAC 0 channel 2 for PCM audio playback data PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4, - 2, 1, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2) + 2, 1, 8, s32le, + 48, 1000, 0, 0, 0, 2, SSP, 2, s32le, 2)
-# Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s16le. +# Low Latency capture pipeline 3 on PCM 1 using max 8 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data +# Use DMAC 0 channel 3 for PCM audio playback data PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4, - 3, 1, 2, s16le, - 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2) + 3, 1, 8, s32le, + 48, 1000, 0, 0, 0, 3, SSP, 2, s32le, 2)
# Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s16le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 @@ -114,17 +114,17 @@ DAI_ADD(sof/pipe-dai-playback.m4, 48, 1000, 0, 0)
# playback DAI is SSP2 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 2, SSP, 2, SSP2-Codec, - PIPELINE_SOURCE_2, 2, s16le, + PIPELINE_SOURCE_2, 2, s32le, 48, 1000, 0, 0)
# capture DAI is SSP2 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, SSP, 2, SSP2-Codec, - PIPELINE_SINK_3, 2, s16le, + PIPELINE_SINK_3, 2, s32le, 48, 1000, 0, 0)
# playback DAI is SSP0 using 2 periods @@ -196,11 +196,11 @@ DAI_CONFIG(SSP, 4, 4, SSP4-Codec, SSP_SAMPLE_BITS(SSP, 4, 32)))
DAI_CONFIG(SSP, 2, 2, SSP2-Codec, - SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in), - DAI_CLOCK(bclk, 1536000, codec_slave), + SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24576000, codec_mclk_in), + DAI_CLOCK(bclk, 12288000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), - DAI_TDM(2, 16, 3, 3), - SSP_SAMPLE_BITS(SSP, 2, 16))) + DAI_TDM(2, 32, 255, 255), + SSP_SAMPLE_BITS(SSP, 2, 32)))
DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
8 channels should be supported.
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com Suggested-by: Keyon Jie yang.jie@linux.intel.com --- topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index b3d3206..6b768e3 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID # PCM Configuration #
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 4b12d2a..f3203f7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration
# -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote:
8 channels should be supported.
Just wondering, is this platform dependent?
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com Suggested-by: Keyon Jie yang.jie@linux.intel.com
topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe- volume-capture.m4 index b3d3206..6b768e3 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID # PCM Configuration #
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 4b12d2a..f3203f7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration
# -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
On 2018年06月08日 13:00, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote:
8 channels should be supported.
Just wondering, is this platform dependent?
this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
thanks ~zhigang
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com Suggested-by: Keyon Jie yang.jie@linux.intel.com
topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe- volume-capture.m4 index b3d3206..6b768e3 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID # PCM Configuration #
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 4b12d2a..f3203f7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration
# -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
On Fri, 2018-06-08 at 13:01 +0800, zhigangw wrote:
On 2018年06月08日 13:00, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote:
8 channels should be supported.
Just wondering, is this platform dependent?
this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
Then is this the right place to define it?
Ranjani
thanks ~zhigang
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com Suggested-by: Keyon Jie yang.jie@linux.intel.com
topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe- volume-capture.m4 index b3d3206..6b768e3 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID # PCM Configuration #
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 4b12d2a..f3203f7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration
# -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
On 2018年06月08日 13:05, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:01 +0800, zhigangw wrote:
On 2018年06月08日 13:00, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote:
8 channels should be supported.
Just wondering, is this platform dependent?
this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
Then is this the right place to define it?
Ranjani
This sets the dynamic range of the channel number we can set. do you have any suggestion about this? I am not familiar with the m4 file's structure. ~zhigang
thanks ~zhigang
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com Suggested-by: Keyon Jie yang.jie@linux.intel.com
topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe- volume-capture.m4 index b3d3206..6b768e3 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID # PCM Configuration #
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 4b12d2a..f3203f7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration
# -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
On Fri, 2018-06-08 at 13:13 +0800, zhigangw wrote:
On 2018年06月08日 13:05, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:01 +0800, zhigangw wrote:
On 2018年06月08日 13:00, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote:
8 channels should be supported.
Just wondering, is this platform dependent?
this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
Then is this the right place to define it?
Ranjani
This sets the dynamic range of the channel number we can set. do you have any suggestion about this? I am not familiar with the m4 file's structure.
Hmm I am not too sure but maybe if you help me answer the question: Does it makes sense to change it for all topologies(for other platforms and SSP's)?
~zhigang
thanks ~zhigang
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com Suggested-by: Keyon Jie yang.jie@linux.intel.com
topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe- volume-capture.m4 index b3d3206..6b768e3 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID # PCM Configuration #
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 4b12d2a..f3203f7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration
# -PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmw are
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
On 2018年06月08日 13:40, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:13 +0800, zhigangw wrote:
On 2018年06月08日 13:05, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:01 +0800, zhigangw wrote:
On 2018年06月08日 13:00, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote:
8 channels should be supported.
Just wondering, is this platform dependent?
this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
Then is this the right place to define it?
Ranjani
This sets the dynamic range of the channel number we can set. do you have any suggestion about this? I am not familiar with the m4 file's structure.
Hmm I am not too sure but maybe if you help me answer the question: Does it makes sense to change it for all topologies(for other platforms and SSP's)?
I think multi-channel support is necessary for all other platform. for stereo or 4-channel or even more channel is depended on special case. but it is necessary to have this ability for each SSP port. thanks ~zhigang
~zhigang
thanks ~zhigang
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com Suggested-by: Keyon Jie yang.jie@linux.intel.com
topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe- volume-capture.m4 index b3d3206..6b768e3 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Capture PCM_ID # PCM Configuration #
-PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Capture PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 4b12d2a..f3203f7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I # PCM Configuration
#-PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) +PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536)
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmw are
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
On Fri, 2018-06-08 at 13:45 +0800, zhigangw wrote:
On 2018年06月08日 13:40, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:13 +0800, zhigangw wrote:
On 2018年06月08日 13:05, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:01 +0800, zhigangw wrote:
On 2018年06月08日 13:00, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote: > 8 channels should be supported.
Just wondering, is this platform dependent?
this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
Then is this the right place to define it?
Ranjani
This sets the dynamic range of the channel number we can set. do you have any suggestion about this? I am not familiar with the m4 file's structure.
Hmm I am not too sure but maybe if you help me answer the question: Does it makes sense to change it for all topologies(for other platforms and SSP's)?
I think multi-channel support is necessary for all other platform. for stereo or 4-channel or even more channel is depended on special case. but it is necessary to have this ability for each SSP port.
OK, then we dont need to change it I suppose.
thanks ~zhigang
~zhigang
thanks ~zhigang
> Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com > Suggested-by: Keyon Jie yang.jie@linux.intel.com > --- > topology/sof/pipe-volume-capture.m4 | 2 +- > topology/sof/pipe-volume-playback.m4 | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/topology/sof/pipe-volume-capture.m4 > b/topology/sof/pipe- > volume-capture.m4 > index b3d3206..6b768e3 100644 > --- a/topology/sof/pipe-volume-capture.m4 > +++ b/topology/sof/pipe-volume-capture.m4 > @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', > PIPELINE_ID), Passthrough Capture PCM_ID > # PCM Configuration > # > > -PCM_CAPABILITIES(Passthrough Capture PCM_ID, > `S32_LE,S24_LE,S16_LE', > 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) > +PCM_CAPABILITIES(Passthrough Capture PCM_ID, > `S32_LE,S24_LE,S16_LE', > 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536) > > diff --git a/topology/sof/pipe-volume-playback.m4 > b/topology/sof/pipe-volume-playback.m4 > index 4b12d2a..f3203f7 100644 > --- a/topology/sof/pipe-volume-playback.m4 > +++ b/topology/sof/pipe-volume-playback.m4 > @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', > PIPELINE_ID), Passthrough Playback PCM_I > # PCM Configuration > > # > -PCM_CAPABILITIES(Passthrough Playback PCM_ID, > `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, > 16384, > 65536, > 65536) > +PCM_CAPABILITIES(Passthrough Playback PCM_ID, > `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, > 16384, > 65536, > 65536) >
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-f irmw are
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmw are
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
On 2018年06月08日 13:45, zhigangw wrote:
On 2018年06月08日 13:40, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:13 +0800, zhigangw wrote:
On 2018年06月08日 13:05, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:01 +0800, zhigangw wrote:
On 2018年06月08日 13:00, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote: > 8 channels should be supported. Just wondering, is this platform dependent?
this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
Then is this the right place to define it?
Ranjani
This sets the dynamic range of the channel number we can set. do you have any suggestion about this? I am not familiar with the m4 file's structure.
Hmm I am not too sure but maybe if you help me answer the question: Does it makes sense to change it for all topologies(for other platforms and SSP's)?
I think multi-channel support is necessary for all other platform. for stereo or 4-channel or even more channel is depended on special case. but it is necessary to have this ability for each SSP port.
we should provide default settings in those helper .m4, if has different requirement(most of our cases actually) we should PCM_CAPABILITIES() to define specific PCM capabilities as we want, not only min/max channels, but all other params also.
Thanks, ~Keyon
thanks ~zhigang
~zhigang
thanks ~zhigang
> Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com > Suggested-by: Keyon Jie yang.jie@linux.intel.com > --- > topology/sof/pipe-volume-capture.m4 | 2 +- > topology/sof/pipe-volume-playback.m4 | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/topology/sof/pipe-volume-capture.m4 > b/topology/sof/pipe- > volume-capture.m4 > index b3d3206..6b768e3 100644 > --- a/topology/sof/pipe-volume-capture.m4 > +++ b/topology/sof/pipe-volume-capture.m4 > @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', > PIPELINE_ID), Passthrough Capture PCM_ID > # PCM Configuration > # > -PCM_CAPABILITIES(Passthrough Capture PCM_ID, > `S32_LE,S24_LE,S16_LE', > 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) > +PCM_CAPABILITIES(Passthrough Capture PCM_ID, > `S32_LE,S24_LE,S16_LE', > 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536) > diff --git a/topology/sof/pipe-volume-playback.m4 > b/topology/sof/pipe-volume-playback.m4 > index 4b12d2a..f3203f7 100644 > --- a/topology/sof/pipe-volume-playback.m4 > +++ b/topology/sof/pipe-volume-playback.m4 > @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', > PIPELINE_ID), Passthrough Playback PCM_I > # PCM Configuration > # > -PCM_CAPABILITIES(Passthrough Playback PCM_ID, > `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, > 16384, > 65536, > 65536) > +PCM_CAPABILITIES(Passthrough Playback PCM_ID, > `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, > 16384, > 65536, > 65536)
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmw are
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
On 2018年06月08日 13:56, Keyon Jie wrote:
On 2018年06月08日 13:45, zhigangw wrote:
On 2018年06月08日 13:40, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:13 +0800, zhigangw wrote:
On 2018年06月08日 13:05, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:01 +0800, zhigangw wrote:
On 2018年06月08日 13:00, Ranjani Sridharan wrote: > On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote: >> 8 channels should be supported. > Just wondering, is this platform dependent? this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
Then is this the right place to define it?
Ranjani
This sets the dynamic range of the channel number we can set. do you have any suggestion about this? I am not familiar with the m4 file's structure.
Hmm I am not too sure but maybe if you help me answer the question: Does it makes sense to change it for all topologies(for other platforms and SSP's)?
I think multi-channel support is necessary for all other platform. for stereo or 4-channel or even more channel is depended on special case. but it is necessary to have this ability for each SSP port.
we should provide default settings in those helper .m4, if has different requirement(most of our cases actually) we should PCM_CAPABILITIES() to define specific PCM capabilities as we want, not only min/max channels, but all other params also.
Thanks, ~Keyon
you means: in this case, in the "sof-apl-tdf8532.m4" file, we can set these parameters for the specific case, right? thanks ~zhigang
thanks ~zhigang
~zhigang
thanks ~zhigang >> Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com >> Suggested-by: Keyon Jie yang.jie@linux.intel.com >> --- >> topology/sof/pipe-volume-capture.m4 | 2 +- >> topology/sof/pipe-volume-playback.m4 | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/topology/sof/pipe-volume-capture.m4 >> b/topology/sof/pipe- >> volume-capture.m4 >> index b3d3206..6b768e3 100644 >> --- a/topology/sof/pipe-volume-capture.m4 >> +++ b/topology/sof/pipe-volume-capture.m4 >> @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', >> PIPELINE_ID), Passthrough Capture PCM_ID >> # PCM Configuration >> # >> -PCM_CAPABILITIES(Passthrough Capture PCM_ID, >> `S32_LE,S24_LE,S16_LE', >> 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) >> +PCM_CAPABILITIES(Passthrough Capture PCM_ID, >> `S32_LE,S24_LE,S16_LE', >> 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536) >> diff --git a/topology/sof/pipe-volume-playback.m4 >> b/topology/sof/pipe-volume-playback.m4 >> index 4b12d2a..f3203f7 100644 >> --- a/topology/sof/pipe-volume-playback.m4 >> +++ b/topology/sof/pipe-volume-playback.m4 >> @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', >> PIPELINE_ID), Passthrough Playback PCM_I >> # PCM Configuration >> # >> -PCM_CAPABILITIES(Passthrough Playback PCM_ID, >> `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, >> 16384, >> 65536, >> 65536) >> +PCM_CAPABILITIES(Passthrough Playback PCM_ID, >> `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, >> 16384, >> 65536, >> 65536) _______________________________________________ Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmw are
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
On 6/8/18 12:56 AM, Keyon Jie wrote:
On 2018年06月08日 13:45, zhigangw wrote:
On 2018年06月08日 13:40, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:13 +0800, zhigangw wrote:
On 2018年06月08日 13:05, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 13:01 +0800, zhigangw wrote:
On 2018年06月08日 13:00, Ranjani Sridharan wrote: > On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote: >> 8 channels should be supported. > Just wondering, is this platform dependent? this is for audio transmitting between the MRB and DIRANA (DSP). the DIRANA's scripts configure its ssp like this already. it is just for SSP2.
Then is this the right place to define it?
Ranjani
This sets the dynamic range of the channel number we can set. do you have any suggestion about this? I am not familiar with the m4 file's structure.
Hmm I am not too sure but maybe if you help me answer the question: Does it makes sense to change it for all topologies(for other platforms and SSP's)?
I think multi-channel support is necessary for all other platform. for stereo or 4-channel or even more channel is depended on special case. but it is necessary to have this ability for each SSP port.
we should provide default settings in those helper .m4, if has different requirement(most of our cases actually) we should PCM_CAPABILITIES() to define specific PCM capabilities as we want, not only min/max channels, but all other params also.
Yes, we need to make the frequency, number of channels parameters instead of hard-code 48 and 2. And we also will need a master/slave option.
Thanks, ~Keyon
thanks ~zhigang
~zhigang
thanks ~zhigang >> Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com >> Suggested-by: Keyon Jie yang.jie@linux.intel.com >> --- >> topology/sof/pipe-volume-capture.m4 | 2 +- >> topology/sof/pipe-volume-playback.m4 | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/topology/sof/pipe-volume-capture.m4 >> b/topology/sof/pipe- >> volume-capture.m4 >> index b3d3206..6b768e3 100644 >> --- a/topology/sof/pipe-volume-capture.m4 >> +++ b/topology/sof/pipe-volume-capture.m4 >> @@ -66,5 +66,5 @@ indir(`define', concat(`PIPELINE_PCM_', >> PIPELINE_ID), Passthrough Capture PCM_ID >> # PCM Configuration >> # >> -PCM_CAPABILITIES(Passthrough Capture PCM_ID, >> `S32_LE,S24_LE,S16_LE', >> 48000, 48000, 2, 4, 2, 16, 192, 16384, 65536, 65536) >> +PCM_CAPABILITIES(Passthrough Capture PCM_ID, >> `S32_LE,S24_LE,S16_LE', >> 48000, 48000, 2, 8, 2, 16, 192, 16384, 65536, 65536) >> diff --git a/topology/sof/pipe-volume-playback.m4 >> b/topology/sof/pipe-volume-playback.m4 >> index 4b12d2a..f3203f7 100644 >> --- a/topology/sof/pipe-volume-playback.m4 >> +++ b/topology/sof/pipe-volume-playback.m4 >> @@ -67,5 +67,5 @@ indir(`define', concat(`PIPELINE_PCM_', >> PIPELINE_ID), Passthrough Playback PCM_I >> # PCM Configuration >> # >> -PCM_CAPABILITIES(Passthrough Playback PCM_ID, >> `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 4, 2, 16, 192, >> 16384, >> 65536, >> 65536) >> +PCM_CAPABILITIES(Passthrough Playback PCM_ID, >> `S32_LE,S24_LE,S16_LE', 48000, 48000, 2, 8, 2, 16, 192, >> 16384, >> 65536, >> 65536) _______________________________________________ Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmw are
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote:
the ssp2 should be tdm8-32bit.
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com
topology/sof-apl-tdf8532.m4 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl- tdf8532.m4 index 5554e58..2a63943 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -38,19 +38,19 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4, 1, 0, 4, s32le, 48, 1000, 0, 0, 0, 1, SSP, 4, s32le, 2)
-# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s16le. +# Low Latency playback pipeline 2 on PCM 1 using max 8 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data +# Use DMAC 0 channel 2 for PCM audio playback data
Zhigang, does this change have any impact? I thought we're ignoring the DMAC channel from topology?
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
- 2, 1, 2, s16le,
- 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2)
- 2, 1, 8, s32le,
- 48, 1000, 0, 0, 0, 2, SSP, 2, s32le, 2)
-# Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s16le. +# Low Latency capture pipeline 3 on PCM 1 using max 8 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data +# Use DMAC 0 channel 3 for PCM audio playback data
same here?
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
- 3, 1, 2, s16le,
- 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2)
- 3, 1, 8, s32le,
- 48, 1000, 0, 0, 0, 3, SSP, 2, s32le, 2)
# Low Latency playback pipeline 4 on PCM 2 using max 2 channels of s16le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 @@ -114,17 +114,17 @@ DAI_ADD(sof/pipe-dai-playback.m4, 48, 1000, 0, 0)
# playback DAI is SSP2 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 2, SSP, 2, SSP2-Codec,
- PIPELINE_SOURCE_2, 2, s16le,
- PIPELINE_SOURCE_2, 2, s32le, 48, 1000, 0, 0)
# capture DAI is SSP2 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, SSP, 2, SSP2-Codec,
- PIPELINE_SINK_3, 2, s16le,
- PIPELINE_SINK_3, 2, s32le, 48, 1000, 0, 0)
# playback DAI is SSP0 using 2 periods @@ -196,11 +196,11 @@ DAI_CONFIG(SSP, 4, 4, SSP4-Codec, SSP_SAMPLE_BITS(SSP, 4, 32)))
DAI_CONFIG(SSP, 2, 2, SSP2-Codec,
SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),DAI_CLOCK(bclk, 1536000, codec_slave),
SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24576000,codec_mclk_in),
DAI_CLOCK(bclk, 12288000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave),
DAI_TDM(2, 16, 3, 3),SSP_SAMPLE_BITS(SSP, 2, 16)))
DAI_TDM(2, 32, 255, 255),SSP_SAMPLE_BITS(SSP, 2, 32)))DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
On 2018年06月08日 12:58, Ranjani Sridharan wrote:
On Fri, 2018-06-08 at 12:38 +0800, Wu Zhigang wrote:
the ssp2 should be tdm8-32bit.
Signed-off-by: Wu Zhigang zhigang.wu@linux.intel.com
topology/sof-apl-tdf8532.m4 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl- tdf8532.m4 index 5554e58..2a63943 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -38,19 +38,19 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4, 1, 0, 4, s32le, 48, 1000, 0, 0, 0, 1, SSP, 4, s32le, 2)
-# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s16le. +# Low Latency playback pipeline 2 on PCM 1 using max 8 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data +# Use DMAC 0 channel 2 for PCM audio playback data
Zhigang, does this change have any impact? I thought we're ignoring the DMAC channel from topology?
thanks for reminding me! br ~zhigang
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-playback.m4,
- 2, 1, 2, s16le,
- 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2)
- 2, 1, 8, s32le,
- 48, 1000, 0, 0, 0, 2, SSP, 2, s32le, 2)
-# Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s16le. +# Low Latency capture pipeline 3 on PCM 1 using max 8 channels of s32le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 -# Use DMAC 0 channel 1 for PCM audio playback data +# Use DMAC 0 channel 3 for PCM audio playback data
same here?
PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4,
- 3, 1, 2, s16le,
- 48, 1000, 0, 0, 0, 1, SSP, 2, s16le, 2)
3, 1, 8, s32le,
48, 1000, 0, 0, 0, 3, SSP, 2, s32le, 2)
# Low Latency playback pipeline 4 on PCM 2 using max 2 channels of
s16le. # Schedule 48 frames per 1000us deadline on core 0 with priority 0 @@ -114,17 +114,17 @@ DAI_ADD(sof/pipe-dai-playback.m4, 48, 1000, 0, 0)
# playback DAI is SSP2 using 2 periods -# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, 2, SSP, 2, SSP2-Codec,
- PIPELINE_SOURCE_2, 2, s16le,
PIPELINE_SOURCE_2, 2, s32le, 48, 1000, 0, 0)
# capture DAI is SSP2 using 2 periods
-# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 +# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 3, SSP, 2, SSP2-Codec,
- PIPELINE_SINK_3, 2, s16le,
PIPELINE_SINK_3, 2, s32le, 48, 1000, 0, 0)
# playback DAI is SSP0 using 2 periods
@@ -196,11 +196,11 @@ DAI_CONFIG(SSP, 4, 4, SSP4-Codec, SSP_SAMPLE_BITS(SSP, 4, 32)))
DAI_CONFIG(SSP, 2, 2, SSP2-Codec,
SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),DAI_CLOCK(bclk, 1536000, codec_slave),
SSP_CONFIG(DSP_B, DAI_CLOCK(mclk, 24576000,codec_mclk_in),
DAI_CLOCK(bclk, 12288000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave),
DAI_TDM(2, 16, 3, 3),SSP_SAMPLE_BITS(SSP, 2, 16)))
DAI_TDM(2, 32, 255, 255),SSP_SAMPLE_BITS(SSP, 2, 32)))DAI_CONFIG(SSP, 0, 0, SSP0-Codec, SSP_CONFIG(I2S, DAI_CLOCK(mclk, 24576000, codec_mclk_in),
Sound-open-firmware mailing list Sound-open-firmware@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/sound-open-firmware
participants (5)
-
Keyon Jie -
Pierre-Louis Bossart -
Ranjani Sridharan -
Wu Zhigang -
zhigangw