| Message ID | 20240625160614.450506-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 903e85093670c3e1107980b5e5a718682458f316 |
| Headers | show |
| Series | ASoC: codecs: lpass-rx-macro: add missing handling of v2.1 codec | expand |
On 25/06/2024 17:06, Krzysztof Kozlowski wrote: > We have also v2.1 version of the codec (see 'enum lpass_codec_version'), > so handle it as well in all switch cases. > > Fixes: dbacef05898d ("ASoC: codec: lpass-rx-macro: prepare driver to accomdate new codec versions") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --srini > sound/soc/codecs/lpass-rx-macro.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c > index 00ecc470ba8b..1c3429f004ed 100644 > --- a/sound/soc/codecs/lpass-rx-macro.c > +++ b/sound/soc/codecs/lpass-rx-macro.c > @@ -1601,6 +1601,7 @@ static bool rx_is_rw_register(struct device *dev, unsigned int reg) > case LPASS_CODEC_VERSION_1_1: > case LPASS_CODEC_VERSION_1_2: > case LPASS_CODEC_VERSION_2_0: > + case LPASS_CODEC_VERSION_2_1: > return rx_pre_2_5_is_rw_register(dev, reg); > case LPASS_CODEC_VERSION_2_5: > case LPASS_CODEC_VERSION_2_6: > @@ -3639,6 +3640,7 @@ static int rx_macro_component_probe(struct snd_soc_component *component) > case LPASS_CODEC_VERSION_1_1: > case LPASS_CODEC_VERSION_1_2: > case LPASS_CODEC_VERSION_2_0: > + case LPASS_CODEC_VERSION_2_1: > controls = rx_macro_def_snd_controls; > num_controls = ARRAY_SIZE(rx_macro_def_snd_controls); > widgets = rx_macro_def_dapm_widgets; > @@ -3812,6 +3814,7 @@ static int rx_macro_probe(struct platform_device *pdev) > case LPASS_CODEC_VERSION_1_1: > case LPASS_CODEC_VERSION_1_2: > case LPASS_CODEC_VERSION_2_0: > + case LPASS_CODEC_VERSION_2_1: > rx->rxn_reg_stride = 0x80; > def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_pre_2_5_defaults); > reg_defaults = kmalloc_array(def_count, sizeof(struct reg_default), GFP_KERNEL);
On Tue, 25 Jun 2024 18:06:14 +0200, Krzysztof Kozlowski wrote: > We have also v2.1 version of the codec (see 'enum lpass_codec_version'), > so handle it as well in all switch cases. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: codecs: lpass-rx-macro: add missing handling of v2.1 codec commit: 903e85093670c3e1107980b5e5a718682458f316 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 00ecc470ba8b..1c3429f004ed 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -1601,6 +1601,7 @@ static bool rx_is_rw_register(struct device *dev, unsigned int reg) case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_2_0: + case LPASS_CODEC_VERSION_2_1: return rx_pre_2_5_is_rw_register(dev, reg); case LPASS_CODEC_VERSION_2_5: case LPASS_CODEC_VERSION_2_6: @@ -3639,6 +3640,7 @@ static int rx_macro_component_probe(struct snd_soc_component *component) case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_2_0: + case LPASS_CODEC_VERSION_2_1: controls = rx_macro_def_snd_controls; num_controls = ARRAY_SIZE(rx_macro_def_snd_controls); widgets = rx_macro_def_dapm_widgets; @@ -3812,6 +3814,7 @@ static int rx_macro_probe(struct platform_device *pdev) case LPASS_CODEC_VERSION_1_1: case LPASS_CODEC_VERSION_1_2: case LPASS_CODEC_VERSION_2_0: + case LPASS_CODEC_VERSION_2_1: rx->rxn_reg_stride = 0x80; def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_pre_2_5_defaults); reg_defaults = kmalloc_array(def_count, sizeof(struct reg_default), GFP_KERNEL);
We have also v2.1 version of the codec (see 'enum lpass_codec_version'), so handle it as well in all switch cases. Fixes: dbacef05898d ("ASoC: codec: lpass-rx-macro: prepare driver to accomdate new codec versions") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- sound/soc/codecs/lpass-rx-macro.c | 3 +++ 1 file changed, 3 insertions(+)