提交 e83e8f0b 编写于 作者: B Brian Norris 提交者: sanglipeng

ASoC: qcom: lpass-cpu: Fix fallback SD line index handling

stable inclusion
from stable-v5.10.164
commit 2adc64f3e669fb9ee1fb2a63f6fd4016a7004afe
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7T7G4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2adc64f3e669fb9ee1fb2a63f6fd4016a7004afe

--------------------------------

commit 000bca8d upstream.

These indices should reference the ID placed within the dai_driver
array, not the indices of the array itself.

This fixes commit 4ff028f6 ("ASoC: qcom: lpass-cpu: Make I2S SD
lines configurable"), which among others, broke IPQ8064 audio
(sound/soc/qcom/lpass-ipq806x.c) because it uses ID 4 but we'd stop
initializing the mi2s_playback_sd_mode and mi2s_capture_sd_mode arrays
at ID 0.

Fixes: 4ff028f6 ("ASoC: qcom: lpass-cpu: Make I2S SD lines configurable")
Cc: <stable@vger.kernel.org>
Signed-off-by: NBrian Norris <computersforpeace@gmail.com>
Reviewed-by: NStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20221231061545.2110253-1-computersforpeace@gmail.comSigned-off-by: NMark Brown <broonie@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 52211d54
...@@ -816,10 +816,11 @@ static void of_lpass_cpu_parse_dai_data(struct device *dev, ...@@ -816,10 +816,11 @@ static void of_lpass_cpu_parse_dai_data(struct device *dev,
struct lpass_data *data) struct lpass_data *data)
{ {
struct device_node *node; struct device_node *node;
int ret, id; int ret, i, id;
/* Allow all channels by default for backwards compatibility */ /* Allow all channels by default for backwards compatibility */
for (id = 0; id < data->variant->num_dai; id++) { for (i = 0; i < data->variant->num_dai; i++) {
id = data->variant->dai_driver[i].id;
data->mi2s_playback_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH; data->mi2s_playback_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH;
data->mi2s_capture_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH; data->mi2s_capture_sd_mode[id] = LPAIF_I2SCTL_MODE_8CH;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册