From 90b78c8f42facc552f392ff793f826fa58c16487 Mon Sep 17 00:00:00 2001 From: sdash Date: Tue, 10 Jan 2017 16:03:37 +0530 Subject: [PATCH] tegra-virt-alt: Match ADMAIF Client and xbar bits Match Client and xbar bits for ADMAIF Interface Jira EMA-380 Change-Id: I20fae77b8418f000415acf578aa858b8b12fb54e Signed-off-by: sdash Reviewed-on: http://git-master/r/1282761 Reviewed-by: Hariharan Sivaraman Tested-by: Hariharan Sivaraman Reviewed-by: svccoveritychecker Reviewed-by: Ravindra Lokhande Reviewed-by: Viraj Karandikar Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Nitin Pai GVS: Gerrit_Virtual_Submit Reviewed-by: Uday Gupta --- sound/soc/tegra-alt/tegra210_adsp_alt.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/tegra-alt/tegra210_adsp_alt.c b/sound/soc/tegra-alt/tegra210_adsp_alt.c index 2b9807fd..5881b625 100644 --- a/sound/soc/tegra-alt/tegra210_adsp_alt.c +++ b/sound/soc/tegra-alt/tegra210_adsp_alt.c @@ -2,7 +2,7 @@ * tegra210_adsp_alt.c - Tegra ADSP audio driver * * Author: Sumit Bhattacharya - * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -2038,23 +2038,25 @@ static int tegra_adsp_admaif_ivc_set_cif(struct tegra210_adsp *adsp, switch (params_format(params)) { case SNDRV_PCM_FORMAT_S8: cif_conf->client_bits = TEGRA210_AUDIOCIF_BITS_8; + cif_conf->audio_bits = TEGRA210_AUDIOCIF_BITS_8; break; case SNDRV_PCM_FORMAT_S16_LE: cif_conf->client_bits = TEGRA210_AUDIOCIF_BITS_16; + cif_conf->audio_bits = TEGRA210_AUDIOCIF_BITS_16; break; case SNDRV_PCM_FORMAT_S24_LE: cif_conf->client_bits = TEGRA210_AUDIOCIF_BITS_24; + cif_conf->audio_bits = TEGRA210_AUDIOCIF_BITS_24; break; case SNDRV_PCM_FORMAT_S32_LE: cif_conf->client_bits = TEGRA210_AUDIOCIF_BITS_32; + cif_conf->audio_bits = TEGRA210_AUDIOCIF_BITS_32; break; default: dev_err(adsp->dev, "Wrong format!\n"); return -EINVAL; } - - cif_conf->audio_bits = TEGRA210_AUDIOCIF_BITS_32; cif_conf->direction = stream; value = (cif_conf->threshold <<