In message: [PATCH linux-yocto] ASoC: fsl_sai: Fix wrong usage of fsl_sai::is_consumer_mode in fsl_sai_hw_params() on 20/12/2023 Kevin Hao wrote:
> From: Kevin Hao <[email protected]> > > The SDK commit 3fc9d125f615 ("ASoC: fsl_sai: add fsl,txm-rxs property > support") has changed fsl_sai::is_consumer_mode to an array of bool. > But the stable commit 4a8774a63303 ("ASoC: fsl_sai: Fix no frame sync > clock issue on i.MX8MP") still use it as a bool. Adjust the codes from > the stable kernel update to fix the following build errors: > sound/soc/fsl/fsl_sai.c: In function ‘fsl_sai_hw_params’: > sound/soc/fsl/fsl_sai.c:697:13: error: the comparison will always evaluate > as ‘true’ for the address of ‘is_consumer_mode’ will never be NULL > [-Werror=address > ] > 697 | !sai->is_consumer_mode) > | ^ > > Signed-off-by: Kevin Hao <[email protected]> > --- > Hi Bruce, > > Please help me merge this into the following two branches: > v6.1/standard/nxp-sdk-6.1/nxp-soc > v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc merged. Bruce > > sound/soc/fsl/fsl_sai.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > index 26e48a57b117..bfe5ea4f9fee 100644 > --- a/sound/soc/fsl/fsl_sai.c > +++ b/sound/soc/fsl/fsl_sai.c > @@ -694,7 +694,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream > *substream, > * FSD_MSTR bit for this specific case. > */ > if (sai->soc_data->mclk_with_tere && sai->mclk_direction_output && > - !sai->is_consumer_mode) > + !sai->is_consumer_mode[tx]) > regmap_update_bits(sai->regmap, FSL_SAI_xCR4(tx, ofs), > FSL_SAI_CR4_FSD_MSTR, 0); > > @@ -708,7 +708,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream > *substream, > > /* Enable FSD_MSTR after configuring word width */ > if (sai->soc_data->mclk_with_tere && sai->mclk_direction_output && > - !sai->is_consumer_mode) > + !sai->is_consumer_mode[tx]) > regmap_update_bits(sai->regmap, FSL_SAI_xCR4(tx, ofs), > FSL_SAI_CR4_FSD_MSTR, FSL_SAI_CR4_FSD_MSTR); > > -- > 2.39.2 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13433): https://lists.yoctoproject.org/g/linux-yocto/message/13433 Mute This Topic: https://lists.yoctoproject.org/mt/103276576/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
