]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ASoC: fsl_sai: fix getting version from VERID
authorShengjiu Wang <shengjiu.wang@nxp.com>
Tue, 7 Feb 2023 09:04:24 +0000 (17:04 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Feb 2023 18:11:50 +0000 (19:11 +0100)
[ Upstream commit 29aab38823b61e482995c24644bd2d8acfe56185 ]

The version information is at the bit31 ~ bit16 in the VERID
register, so need to right shift 16bit to get it, otherwise
the result of comparison "sai->verid.version >= 0x0301" is
wrong.

Fixes: 99c1e74f25d4 ("ASoC: fsl_sai: store full version instead of major/minor")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/1675760664-25193-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/fsl/fsl_sai.c

index e60c7b3445623b625ff013297d249652e86018bd..8205b321714957a4590dc5fbccf6f61807383304 100644 (file)
@@ -1141,6 +1141,7 @@ static int fsl_sai_check_version(struct device *dev)
 
        sai->verid.version = val &
                (FSL_SAI_VERID_MAJOR_MASK | FSL_SAI_VERID_MINOR_MASK);
+       sai->verid.version >>= FSL_SAI_VERID_MINOR_SHIFT;
        sai->verid.feature = val & FSL_SAI_VERID_FEATURE_MASK;
 
        ret = regmap_read(sai->regmap, FSL_SAI_PARAM, &val);