lkml.org 
[lkml]   [2020]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 107/367] ASoC: tegra: Revert 24 and 32 bit support
    Date
    From: Jon Hunter <jonathanh@nvidia.com>

    commit 961b91a93ea27495022b2bdc3ca0f608f2c97b5f upstream.

    Commit f3ee99087c8ca0ecfdd549ef5a94f557c42d5428 ("ASoC: tegra: Allow
    24bit and 32bit samples") added 24-bit and 32-bit support for to the
    Tegra30 I2S driver. However, there are two additional commits that are
    also needed to get 24-bit and 32-bit support to work correctly. These
    commits are not yet applied because there are still some review comments
    that need to be addressed. With only this change applied, 24-bit and
    32-bit support is advertised by the I2S driver, but it does not work and
    the audio is distorted. Therefore, revert this patch for now until the
    other changes are also ready.

    Furthermore, a clock issue with 24-bit support has been identified with
    this change and so if we revert this now, we can also fix that in the
    updated version.

    Reported-by: Dmitry Osipenko <digetx@gmail.com>
    Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
    Tested-by: Dmitry Osipenko <digetx@gmail.com>
    Link: https://lore.kernel.org/r/20200131091901.13014-1-jonathanh@nvidia.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/tegra/tegra30_i2s.c | 25 +++++--------------------
    1 file changed, 5 insertions(+), 20 deletions(-)

    --- a/sound/soc/tegra/tegra30_i2s.c
    +++ b/sound/soc/tegra/tegra30_i2s.c
    @@ -127,7 +127,7 @@ static int tegra30_i2s_hw_params(struct
    struct device *dev = dai->dev;
    struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);
    unsigned int mask, val, reg;
    - int ret, sample_size, srate, i2sclock, bitcnt, audio_bits;
    + int ret, sample_size, srate, i2sclock, bitcnt;
    struct tegra30_ahub_cif_conf cif_conf;

    if (params_channels(params) != 2)
    @@ -137,19 +137,8 @@ static int tegra30_i2s_hw_params(struct
    switch (params_format(params)) {
    case SNDRV_PCM_FORMAT_S16_LE:
    val = TEGRA30_I2S_CTRL_BIT_SIZE_16;
    - audio_bits = TEGRA30_AUDIOCIF_BITS_16;
    sample_size = 16;
    break;
    - case SNDRV_PCM_FORMAT_S24_LE:
    - val = TEGRA30_I2S_CTRL_BIT_SIZE_24;
    - audio_bits = TEGRA30_AUDIOCIF_BITS_24;
    - sample_size = 24;
    - break;
    - case SNDRV_PCM_FORMAT_S32_LE:
    - val = TEGRA30_I2S_CTRL_BIT_SIZE_32;
    - audio_bits = TEGRA30_AUDIOCIF_BITS_32;
    - sample_size = 32;
    - break;
    default:
    return -EINVAL;
    }
    @@ -181,8 +170,8 @@ static int tegra30_i2s_hw_params(struct
    cif_conf.threshold = 0;
    cif_conf.audio_channels = 2;
    cif_conf.client_channels = 2;
    - cif_conf.audio_bits = audio_bits;
    - cif_conf.client_bits = audio_bits;
    + cif_conf.audio_bits = TEGRA30_AUDIOCIF_BITS_16;
    + cif_conf.client_bits = TEGRA30_AUDIOCIF_BITS_16;
    cif_conf.expand = 0;
    cif_conf.stereo_conv = 0;
    cif_conf.replicate = 0;
    @@ -317,18 +306,14 @@ static const struct snd_soc_dai_driver t
    .channels_min = 2,
    .channels_max = 2,
    .rates = SNDRV_PCM_RATE_8000_96000,
    - .formats = SNDRV_PCM_FMTBIT_S32_LE |
    - SNDRV_PCM_FMTBIT_S24_LE |
    - SNDRV_PCM_FMTBIT_S16_LE,
    + .formats = SNDRV_PCM_FMTBIT_S16_LE,
    },
    .capture = {
    .stream_name = "Capture",
    .channels_min = 2,
    .channels_max = 2,
    .rates = SNDRV_PCM_RATE_8000_96000,
    - .formats = SNDRV_PCM_FMTBIT_S32_LE |
    - SNDRV_PCM_FMTBIT_S24_LE |
    - SNDRV_PCM_FMTBIT_S16_LE,
    + .formats = SNDRV_PCM_FMTBIT_S16_LE,
    },
    .ops = &tegra30_i2s_dai_ops,
    .symmetric_rates = 1,

    \
     
     \ /
      Last update: 2020-02-10 14:05    [W:4.033 / U:0.652 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site