mirror of https://github.com/thesofproject/sof.git
topology : update max98357a configuration in CML
With m/n divider support, we can now support 24 bit/ 48k on max98357a. Add check to only use update BCLK if m/n support is present. Else fallback to older settings. Signed-off-by: Sathya Prakash M R <sathya.prakash.m.r@intel.com>
This commit is contained in:
Sathya Prakash M R
Liam Girdwood
parent
f0264aa0c5
commit
7663447632
|
|
@ -21,10 +21,17 @@ dnl time_domain, sched_comp)
|
|||
|
||||
# Low Latency playback pipeline 8 on PCM 6 using max 2 channels of s32le.
|
||||
# Schedule 1000us deadline on core 0 with priority 0
|
||||
PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4,
|
||||
8, 6, 2, s32le,
|
||||
1000, 0, 0,
|
||||
48000, 48000, 48000)
|
||||
# pipe-src pipeline is needed for older SSP config
|
||||
|
||||
ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1',
|
||||
`PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
|
||||
7, 5, 2, s32le,
|
||||
1000, 0, 0,
|
||||
48000, 48000, 48000)',
|
||||
`PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4,
|
||||
7, 5, 2, s32le,
|
||||
1000, 0, 0,
|
||||
48000, 48000, 48000)')
|
||||
|
||||
#
|
||||
# Speaker DAIs configuration
|
||||
|
|
@ -37,10 +44,17 @@ dnl deadline, priority, core)
|
|||
|
||||
# playback DAI is SSP1 using 2 periods
|
||||
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
|
||||
DAI_ADD(sof/pipe-dai-playback.m4,
|
||||
8, SSP, 1, SSP1-Codec,
|
||||
PIPELINE_SOURCE_8, 2, s16le,
|
||||
1000, 0, 0)
|
||||
#With m/n divider available we can support 24 bit playback
|
||||
|
||||
ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1',
|
||||
`DAI_ADD(sof/pipe-dai-playback.m4,
|
||||
7, SSP, 1, SSP1-Codec,
|
||||
PIPELINE_SOURCE_7, 2, s24le,
|
||||
1000, 0, 0)',
|
||||
`DAI_ADD(sof/pipe-dai-playback.m4,
|
||||
7, SSP, 1, SSP1-Codec,
|
||||
PIPELINE_SOURCE_7, 2, s16le,
|
||||
1000, 0, 0)')
|
||||
|
||||
# PCM Low Latency, id 0
|
||||
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
|
||||
|
|
@ -51,9 +65,18 @@ PCM_PLAYBACK_ADD(Speakers, 6, PIPELINE_PCM_8)
|
|||
#
|
||||
|
||||
#SSP 1 (ID: 6)
|
||||
DAI_CONFIG(SSP, 1, 6, SSP1-Codec,
|
||||
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
|
||||
SSP_CLOCK(bclk, 1500000, codec_slave),
|
||||
SSP_CLOCK(fsync, 46875, codec_slave),
|
||||
SSP_TDM(2, 16, 3, 3),
|
||||
SSP_CONFIG_DATA(SSP, 1, 16)))
|
||||
# Use BCLK derived using m/n divider only on later versions
|
||||
|
||||
ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1',
|
||||
`DAI_CONFIG(SSP, 1, 6, SSP1-Codec,
|
||||
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
|
||||
SSP_CLOCK(bclk, 2304000, codec_slave),
|
||||
SSP_CLOCK(fsync, 48000, codec_slave),
|
||||
SSP_TDM(2, 24, 3, 3),
|
||||
SSP_CONFIG_DATA(SSP, 1, 24)))',
|
||||
`DAI_CONFIG(SSP, 1, 6, SSP1-Codec,
|
||||
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
|
||||
SSP_CLOCK(bclk, 1500000, codec_slave),
|
||||
SSP_CLOCK(fsync, 46875, codec_slave),
|
||||
SSP_TDM(2, 16, 3, 3),
|
||||
SSP_CONFIG_DATA(SSP, 1, 16)))')
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
# Include SOF CML RT5682 Topology
|
||||
# This includes topology for RT5682, DMIC and 3 HDMI Pass through pipeline
|
||||
include(`sof-cml-rt5682-kwd.m4')
|
||||
include(`abi.h')
|
||||
|
||||
DEBUG_START
|
||||
#
|
||||
|
|
@ -23,10 +24,17 @@ dnl time_domain, sched_comp)
|
|||
|
||||
# Low Latency playback pipeline 7 on PCM 5 using max 2 channels of s32le.
|
||||
# Set 1000us deadline on core 0 with priority 0
|
||||
PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4,
|
||||
# pipe-src pipeline is needed for older SSP config
|
||||
|
||||
ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1',
|
||||
`PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
|
||||
7, 5, 2, s32le,
|
||||
1000, 0, 0,
|
||||
48000, 48000, 48000)
|
||||
48000, 48000, 48000)',
|
||||
`PIPELINE_PCM_ADD(sof/pipe-src-volume-playback.m4,
|
||||
7, 5, 2, s32le,
|
||||
1000, 0, 0,
|
||||
48000, 48000, 48000)')
|
||||
|
||||
#
|
||||
# Speaker DAIs configuration
|
||||
|
|
@ -39,10 +47,17 @@ dnl deadline, priority, core)
|
|||
|
||||
# playback DAI is SSP1 using 2 periods
|
||||
# Buffers use s16le format, 1000us deadline on core 0 with priority 0
|
||||
DAI_ADD(sof/pipe-dai-playback.m4,
|
||||
#With m/n divider available we can support 24 bit playback
|
||||
|
||||
ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1',
|
||||
`DAI_ADD(sof/pipe-dai-playback.m4,
|
||||
7, SSP, 1, SSP1-Codec,
|
||||
PIPELINE_SOURCE_7, 2, s16le,
|
||||
1000, 0, 0)
|
||||
PIPELINE_SOURCE_7, 2, s24le,
|
||||
1000, 0, 0)',
|
||||
`DAI_ADD(sof/pipe-dai-playback.m4,
|
||||
7, SSP, 1, SSP1-Codec,
|
||||
PIPELINE_SOURCE_7, 2, s16le,
|
||||
1000, 0, 0)')
|
||||
|
||||
# PCM Low Latency, id 0
|
||||
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)
|
||||
|
|
@ -53,11 +68,20 @@ PCM_PLAYBACK_ADD(Speakers, 5, PIPELINE_PCM_7)
|
|||
#
|
||||
|
||||
#SSP 1 (ID: 6)
|
||||
DAI_CONFIG(SSP, 1, 6, SSP1-Codec,
|
||||
# Use BCLK derived using m/n divider only on later versions
|
||||
|
||||
ifelse(SOF_ABI_VERSION_3_9_OR_GRT, `1',
|
||||
`DAI_CONFIG(SSP, 1, 6, SSP1-Codec,
|
||||
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
|
||||
SSP_CLOCK(bclk, 1500000, codec_slave),
|
||||
SSP_CLOCK(fsync, 46875, codec_slave),
|
||||
SSP_TDM(2, 16, 3, 3),
|
||||
SSP_CONFIG_DATA(SSP, 1, 16)))
|
||||
SSP_CLOCK(bclk, 2304000, codec_slave),
|
||||
SSP_CLOCK(fsync, 48000, codec_slave),
|
||||
SSP_TDM(2, 24, 3, 3),
|
||||
SSP_CONFIG_DATA(SSP, 1, 24)))',
|
||||
`DAI_CONFIG(SSP, 1, 6, SSP1-Codec,
|
||||
SSP_CONFIG(I2S, SSP_CLOCK(mclk, 24000000, codec_mclk_in),
|
||||
SSP_CLOCK(bclk, 1500000, codec_slave),
|
||||
SSP_CLOCK(fsync, 46875, codec_slave),
|
||||
SSP_TDM(2, 16, 3, 3),
|
||||
SSP_CONFIG_DATA(SSP, 1, 16)))')
|
||||
|
||||
DEBUG_END
|
||||
|
|
|
|||
Loading…
Reference in New Issue