Commit 20629eb4 authored by Sameer Pujar's avatar Sameer Pujar Committed by sanglipeng1
Browse files

ASoC: tegra: Fix DSPK 16-bit playback 

stable inclusion
from stable-v5.10.217
commit 7fbcbb96aee2ab4438d8d3610a27cad056ef980a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAWLXC

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



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

commit 2e93a29b48a017c777d4fcbfcc51aba4e6a90d38 upstream.

DSPK configuration is wrong for 16-bit playback and this happens because
the client config is always fixed at 24-bit in hw_params(). Fix this by
updating the client config to 16-bit for the respective playback.

Fixes: 327ef647 ("ASoC: tegra: Add Tegra186 based DSPK driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSameer Pujar <spujar@nvidia.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://msgid.link/r/20240405104306.551036-1-spujar@nvidia.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent ce830500

sound/soc/tegra/tegra186_dspk.c

+3 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// SPDX-FileCopyrightText: Copyright (c) 2020-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

//

// tegra186_dspk.c - Tegra186 DSPK driver

//

// Copyright (c) 2020 NVIDIA CORPORATION. All rights reserved.



#include <linux/clk.h>

#include <linux/device.h>
@@ -241,14 +240,14 @@ static int tegra186_dspk_hw_params(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	cif_conf.client_bits = TEGRA_ACIF_BITS_24;



	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S16_LE:

		cif_conf.audio_bits = TEGRA_ACIF_BITS_16;

		cif_conf.client_bits = TEGRA_ACIF_BITS_16;

		break;

	case SNDRV_PCM_FORMAT_S32_LE:

		cif_conf.audio_bits = TEGRA_ACIF_BITS_32;

		cif_conf.client_bits = TEGRA_ACIF_BITS_24;

		break;

	default:

		dev_err(dev, "unsupported format!\n");