From 0c17f1f661c11a9c6b45dd2b3023909009a4814b Mon Sep 17 00:00:00 2001 From: Songhee Baek Date: Tue, 10 Jun 2014 10:37:20 -0700 Subject: [PATCH] ASoC: tegra-alt: Unblock T210 SPDIF CIF setting This change is for T210 SPDIF driver to be able to program CIF register so we can test SPDIF driver in T210. Bug 1442940 Change-Id: I529cb49e9b6c09a064d3ea1dbf3746cb34f0c5f4 Signed-off-by: Songhee Baek Reviewed-on: http://git-master/r/421743 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Arun Shamanna Lakshmi Reviewed-by: Dara Ramesh Reviewed-by: Bharat Nihalani --- sound/soc/tegra-alt/tegra210_spdif_alt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/tegra-alt/tegra210_spdif_alt.c b/sound/soc/tegra-alt/tegra210_spdif_alt.c index 9f36efec..1b1b1be9 100644 --- a/sound/soc/tegra-alt/tegra210_spdif_alt.c +++ b/sound/soc/tegra-alt/tegra210_spdif_alt.c @@ -77,7 +77,7 @@ static int tegra210_spdif_runtime_resume(struct device *dev) static int tegra210_spdif_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { - #ifndef CONFIG_MACH_GRENADA +#ifndef CONFIG_MACH_GRENADA struct device *dev = dai->dev; struct tegra210_spdif *spdif = snd_soc_dai_get_drvdata(dai); int spdif_out_clock_rate, spdif_in_clock_rate; @@ -131,7 +131,7 @@ static int tegra210_spdif_set_dai_sysclk(struct snd_soc_dai *dai, return ret; } } - #endif +#endif return 0; } @@ -140,7 +140,6 @@ static int tegra210_spdif_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { -#ifndef CONFIG_MACH_GRENADA struct device *dev = dai->dev; struct tegra210_spdif *spdif = snd_soc_dai_get_drvdata(dai); int channels, audio_bits, bit_mode; @@ -186,7 +185,7 @@ static int tegra210_spdif_hw_params(struct snd_pcm_substream *substream, TEGRA210_SPDIF_CIF_RXD_CTRL, &cif_conf); } -#endif + return 0; }