diff options
| author | Rahul Mittal <rmittal@nvidia.com> | 2013-06-11 12:57:33 +0530 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-06-13 12:25:52 -0700 |
| commit | 5d8965a71e26f74077de18daec67f8d38462db8e (patch) | |
| tree | 2c7120e6e022e53c1a83d1bb8b36c8fdde9cbcdf /sound | |
| parent | b7512706b4e44fc888c5edfd3ea95b627f7eba45 (diff) | |
asoc: tegra: Add reset for SPDIF controller
Add soft reset for SPDIF
Since SPDIF soft reset does not work for T11x,
added WAR proposed by HW to reset spdif controller
Bug 966770
Change-Id: Ifd871c585aae3c25f8dc9416e596c7a176e1ea3e
Signed-off-by: Rahul Mittal <rmittal@nvidia.com>
Reviewed-on: http://git-master/r/236300
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra30_spdif.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra30_spdif.c b/sound/soc/tegra/tegra30_spdif.c index 038127c0afb0..f29240f4615f 100644 --- a/sound/soc/tegra/tegra30_spdif.c +++ b/sound/soc/tegra/tegra30_spdif.c @@ -2,11 +2,10 @@ * tegra30_spdif.c - Tegra30 SPDIF driver * * Author: Sumit Bhattacharya <sumitb@nvidia.com> - * Copyright (C) 2011 - NVIDIA, Inc. * * Based on code copyright/by: * - * Copyright (c) 2009-2011, NVIDIA Corporation. + * Copyright (c) 2009-2013 NVIDIA Corporation. All Rights Reserved. * Scott Peterson <speterson@nvidia.com> * * Copyright (C) 2010 Google, Inc. @@ -36,8 +35,10 @@ #include <linux/seq_file.h> #include <linux/slab.h> #include <linux/io.h> +#include <linux/delay.h> #include <mach/iomap.h> #include <mach/hdmi-audio.h> +#include <mach/clk.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -306,6 +307,25 @@ static int tegra30_spdif_hw_params(struct snd_pcm_substream *substream, return 0; } +static void tegra30_spdif_reset(struct tegra30_spdif *spdif) +{ +#ifndef CONFIG_ARCH_TEGRA_11x_SOC + u32 val; + int dcnt = 10; + + val = tegra30_spdif_read(spdif, TEGRA30_SPDIF_CTRL); + val |= TEGRA30_SPDIF_CTRL_SOFT_RESET_ENABLE; + tegra30_spdif_write(spdif, TEGRA30_SPDIF_CTRL, val); + + while ((tegra30_spdif_read(spdif, TEGRA30_SPDIF_CTRL) & + TEGRA30_SPDIF_CTRL_SOFT_RESET_ENABLE) && dcnt--) + udelay(100); +#else + tegra_periph_reset_assert(spdif->clk_spdif_out); + tegra_periph_reset_deassert(spdif->clk_spdif_out); +#endif +} + static void tegra30_spdif_start_playback(struct tegra30_spdif *spdif) { tegra30_ahub_enable_tx_fifo(spdif->txcif); @@ -320,6 +340,7 @@ static void tegra30_spdif_stop_playback(struct tegra30_spdif *spdif) spdif->reg_ctrl &= ~(TEGRA30_SPDIF_CTRL_TX_EN_ENABLE | TEGRA30_SPDIF_CTRL_TC_EN_ENABLE); tegra30_spdif_write(spdif, TEGRA30_SPDIF_CTRL, spdif->reg_ctrl); + tegra30_spdif_reset(spdif); } static int tegra30_spdif_trigger(struct snd_pcm_substream *substream, int cmd, |