nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

asoc: tegra-alt: fix mixer gain update

Browse Source 
Update all gain parameters when updating gain. Not doing so
causes mixer to take other parameters in undefined state
causing distortion.

Cache gain values and use that value when setting in hw params.
This avoids overwriting user programmed gain.

Bug 200078605

Change-Id: I2ff9c096445ccd928a7c1c482bf418f5564175c3
Signed-off-by: Viraj Karandikar <vkarandikar@nvidia.com>
Reviewed-on: http://git-master/r/696351
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Rahul Mittal <rmittal@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
This commit is contained in:
Viraj Karandikar
2015-02-10 17:08:39 +05:30
committed by Sameer Pujar
parent 9fb4155740
commit 32771bb391
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sound/soc/tegra-alt/tegra210_mixer_alt.c
View File

@@ -1,7 +1,7 @@
/* /*
* tegra210_mixer_alt.c - Tegra210 MIXER driver * tegra210_mixer_alt.c - Tegra210 MIXER driver
* *
* Copyright (c) 2014 NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2015 NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -157,14 +157,23 @@ static int tegra210_mixer_put_gain(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct tegra210_mixer *mixer = snd_soc_codec_get_drvdata(codec); struct tegra210_mixer *mixer = snd_soc_codec_get_drvdata(codec);
unsigned int reg = mc->reg; unsigned int reg = mc->reg;
unsigned int ret; unsigned int ret, i;
/* set the gain and trigger config */ /* write default gain config poly coefficients */
for (i = 0; i < 14; i++)
tegra210_mixer_write_ram(mixer, reg + i, mixer->gain_coeff[i]);
/* write new gain and trigger config */
ret = tegra210_mixer_write_ram(mixer, reg + 0x09, ret = tegra210_mixer_write_ram(mixer, reg + 0x09,
ucontrol->value.integer.value[0]); ucontrol->value.integer.value[0]);
ret |= tegra210_mixer_write_ram(mixer, reg + 0x0f, ret |= tegra210_mixer_write_ram(mixer, reg + 0x0f,
ucontrol->value.integer.value[0]); ucontrol->value.integer.value[0]);
/* save gain */
i = (reg - TEGRA210_MIXER_AHUBRAMCTL_GAIN_CONFIG_RAM_ADDR_0) /
TEGRA210_MIXER_AHUBRAMCTL_GAIN_CONFIG_RAM_ADDR_STRIDE;
mixer->gain_value[i] = ucontrol->value.integer.value[0];
return ret; return ret;
} }
@@ -224,6 +233,11 @@ static int tegra210_mixer_in_hw_params(struct snd_pcm_substream *substream,
mixer->gain_coeff[i]); mixer->gain_coeff[i]);
} }
/* write saved gain */
ret = tegra210_mixer_write_ram(mixer,
MIXER_GAIN_CONFIG_RAM_ADDR(dai->id) + 0x09,
mixer->gain_value[dai->id]);
/* trigger the polynomial configuration */ /* trigger the polynomial configuration */
tegra210_mixer_write_ram(mixer, tegra210_mixer_write_ram(mixer,
MIXER_GAIN_CONFIG_RAM_ADDR(dai->id) + 0xf, MIXER_GAIN_CONFIG_RAM_ADDR(dai->id) + 0xf,
@@ -596,7 +610,7 @@ static int tegra210_mixer_platform_probe(struct platform_device *pdev)
struct tegra210_mixer *mixer; struct tegra210_mixer *mixer;
struct resource *mem, *memregion; struct resource *mem, *memregion;
void __iomem *regs; void __iomem *regs;
int ret; int ret, i;
const struct of_device_id *match; const struct of_device_id *match;
struct tegra210_mixer_soc_data *soc_data; struct tegra210_mixer_soc_data *soc_data;
@@ -633,6 +647,9 @@ static int tegra210_mixer_platform_probe(struct platform_device *pdev)
mixer->gain_coeff[12] = 0x3e80; mixer->gain_coeff[12] = 0x3e80;
mixer->gain_coeff[13] = 0x83126E; mixer->gain_coeff[13] = 0x83126E;
for (i = 0; i < TEGRA210_MIXER_AXBAR_RX_MAX; i++)
mixer->gain_value[i] = 0x10000;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { if (!mem) {
dev_err(&pdev->dev, "No memory resource\n"); dev_err(&pdev->dev, "No memory resource\n");