diff options
Diffstat (limited to 'sound/soc/tegra/tegra_soc_wm8753.c')
| -rw-r--r-- | sound/soc/tegra/tegra_soc_wm8753.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/sound/soc/tegra/tegra_soc_wm8753.c b/sound/soc/tegra/tegra_soc_wm8753.c index ab4e884047dc..99756a3a0b82 100644 --- a/sound/soc/tegra/tegra_soc_wm8753.c +++ b/sound/soc/tegra/tegra_soc_wm8753.c @@ -158,23 +158,14 @@ static int tegra_hifi_hw_params(struct snd_pcm_substream *substream, unsigned int value; int err; enum dac_dap_data_format data_fmt; - struct audio_dev_property dev_prop; -#ifdef CONFIG_ARCH_TEGRA_2x_SOC if (tegra_das_is_port_master(tegra_audio_codec_type_hifi)) -#else - if(tegra_das_is_device_master(tegra_audio_codec_type_hifi)) -#endif dai_flag |= SND_SOC_DAIFMT_CBM_CFM; else dai_flag |= SND_SOC_DAIFMT_CBS_CFS; -#ifdef CONFIG_ARCH_TEGRA_2x_SOC data_fmt = tegra_das_get_codec_data_fmt(tegra_audio_codec_type_hifi); -#else - tegra_das_get_device_property(tegra_audio_codec_type_hifi,&dev_prop); - data_fmt = dev_prop.dac_dap_data_comm_format; -#endif + /* We are supporting DSP and I2s format for now */ if (data_fmt & dac_dap_data_format_dsp) dai_flag |= SND_SOC_DAIFMT_DSP_A; @@ -331,21 +322,13 @@ static int tegra_voice_hw_params(struct snd_pcm_substream *substream, enum dac_dap_data_format data_fmt; struct audio_dev_property dev_prop; -#ifdef CONFIG_ARCH_TEGRA_2x_SOC if (tegra_das_is_port_master(tegra_audio_codec_type_bluetooth)) -#else - if(tegra_das_is_device_master(tegra_audio_codec_type_bluetooth)) -#endif dai_flag |= SND_SOC_DAIFMT_CBM_CFM; else dai_flag |= SND_SOC_DAIFMT_CBS_CFS; -#ifdef CONFIG_ARCH_TEGRA_2x_SOC data_fmt = tegra_das_get_codec_data_fmt(tegra_audio_codec_type_bluetooth); -#else - tegra_das_get_device_property(tegra_audio_codec_type_bluetooth,&dev_prop); - data_fmt = dev_prop.dac_dap_data_comm_format; -#endif + /* We are supporting DSP and I2s format for now */ if (data_fmt & dac_dap_data_format_i2s) dai_flag |= SND_SOC_DAIFMT_I2S; |