diff options
| author | Scott Peterson <speterson@nvidia.com> | 2013-05-21 18:43:28 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-05-27 02:52:27 -0700 |
| commit | cbe409bb202a976e9c0ff9c3bfbd1d5ac6e42b62 (patch) | |
| tree | d304cbc3566ba4dfeb41c612cca76d1d3ffb8589 /sound | |
| parent | 96ec1657fd3bd227dc93d413e134fc2a6c072d08 (diff) | |
arm:tegra:roth: only expose tfa9887 on Thor
Only expose the tfa9887 controls for power
doen on THor
Bug 1293745
Change-Id: I2418b526cb44d284cd6c887eb7fbb60775dd4a32
Signed-off-by: Scott Peterson <speterson@nvidia.com>
Reviewed-on: http://git-master/r/231367
Reviewed-by: Xiao Bo Zhao <xiaoboz@nvidia.com>
Tested-by: Xiao Bo Zhao <xiaoboz@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 717ff11960a2..8bf7c1034d34 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -658,11 +658,13 @@ static int tegra_rt5640_init(struct snd_soc_pcm_runtime *rtd) if (ret < 0) return ret; - ret = snd_ctl_add(machine->util_data.card->snd_card, + if (machine_is_roth()) { + ret = snd_ctl_add(machine->util_data.card->snd_card, snd_ctl_new1(&tegra_tfa9887_controls, &machine->util_data)); - if (ret < 0) { - dev_err(card->dev, "Can't add tfa9887 alsa control"); - return ret; + if (ret < 0) { + dev_err(card->dev, "Can't add tfa9887 alsa control"); + return ret; + } } /* FIXME: Calculate automatically based on DAPM routes? */ |