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: arad spew fixes

Browse Source 
In lane enable functionality currently
we don't check the existing state of lane.
Change make sure to do nothing if current
state is same as previous state.

Bug 200179285

Change-Id: Ic7492fbc5aabd093d49dba546d0fb17282a30bcf
Signed-off-by: Dipesh Gandhi <dipeshg@nvidia.com>
(cherry-picked from commit ebf11df77e0322e473fc4fa6ae0020135f7c6ea9)
Reviewed-on: http://git-master/r/1160156
Reviewed-on: http://git-master/r/1158151

(cherry picked from commit bd562cf6b19bf605f749617335da151baa9f0a71)

Change-Id: I3f61d79ffd88e479fe320e06cd19f7c6183bf112
Reviewed-on: http://git-master/r/1167575
GVS: Gerrit_Virtual_Submit
Tested-by: Dipesh Gandhi <dipeshg@nvidia.com>
Reviewed-by: Nitin Pai <npai@nvidia.com>
This commit is contained in:
Dipesh Gandhi
2016-06-02 21:26:23 +05:30
committed by Sameer Pujar
parent 5131ed7b89
commit 45037f4a0a
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/tegra-alt/tegra186_arad_alt.c
View File

@@ -293,12 +293,23 @@ static int tegra186_arad_put_enable_lane(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *arad_private =
(struct soc_mixer_control *)kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
struct device *dev = codec->dev;
struct tegra186_arad *arad = snd_soc_codec_get_drvdata(codec);
unsigned int enable = 0, lane_id = arad_private->shift;
unsigned int enable = 0, lane_id = arad_private->shift, state;
int dcnt = 10;
pm_runtime_get_sync(dev);
regmap_read(arad->regmap,
TEGRA186_ARAD_LANE_STATUS, &state);
enable = ucontrol->value.integer.value[0];
/* Return, if current state and requested state of lane is disable */
if (!enable && !((state >> lane_id) & 1)) {
pm_runtime_put_sync(dev);
return 0;
}
regmap_update_bits(arad->regmap,
arad_private->reg, 1<<arad_private->shift,
enable<<arad_private->shift);
@@ -306,7 +317,7 @@ static int tegra186_arad_put_enable_lane(struct snd_kcontrol *kcontrol,
if (enable)
while (!tegra186_arad_get_lane_lock_status(arad, lane_id) &&
dcnt--)
udelay(100);
udelay(10000);
else {
regmap_update_bits(arad->regmap,
TEGRA186_ARAD_LANE_SOFT_RESET, 1<<arad_private->shift,
@@ -315,6 +326,7 @@ static int tegra186_arad_put_enable_lane(struct snd_kcontrol *kcontrol,
dcnt--)
udelay(100);
}
pm_runtime_put_sync(dev);
if (dcnt < 0) {
if (enable)
@@ -656,6 +668,7 @@ static bool tegra186_arad_volatile_reg(struct device *dev, unsigned int reg)
}
switch (reg) {
case TEGRA186_ARAD_LANE_ENABLE:
case TEGRA186_ARAD_LANE_STATUS:
case TEGRA186_ARAD_LANE_INT_STATUS:
case TEGRA186_ARAD_STATUS: