diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2014-05-04 20:21:15 -0700 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2014-05-06 10:50:22 -0700 |
| commit | 7195780d0b7150725084926a7febada7dcd77476 (patch) | |
| tree | f85d5c28a4eb8f05c4a28827e162871741801cac /sound | |
| parent | 31b72fb68dda584ff983122d402148aca5a495f5 (diff) | |
tegra: Remove old SOC/Board support
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Change-Id: I06582980f2e9e88ab0e34bc5febc5d939fb77cc4
Reviewed-on: http://git-master/r/404934
(cherry picked from commit d1095251dadc17cb2c4f885f0d5d23359536f02b)
Reviewed-on: http://git-master/r/405472
Reviewed-by: Riham Haidar <rhaidar@nvidia.com>
Tested-by: Riham Haidar <rhaidar@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/max97236.c | 13 | ||||
| -rw-r--r-- | sound/soc/tegra/Kconfig | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/sound/soc/codecs/max97236.c b/sound/soc/codecs/max97236.c index 0b21a2db08f1..713521bfcf57 100644 --- a/sound/soc/codecs/max97236.c +++ b/sound/soc/codecs/max97236.c @@ -730,13 +730,6 @@ static int max97236_jacksw_active(struct max97236_priv *max97236) #endif int ret; - /* Overwrite above code using board id */ - if (board_info.board_id == BOARD_E1690) { - test_value = 0; - } else { /* ERS */ - test_value = 4; - } - regmap_read(max97236->regmap, M97236_REG_00_STATUS1, ®); ret = (reg & M97236_JACKSW_MASK) == test_value; @@ -1161,12 +1154,6 @@ static int test_jack_presence(struct max97236_priv *max97236, int delay) #else test_value = 0; #endif - /* Overwrite above code using board id */ - if (board_info.board_id == BOARD_E1690) { - test_value = 0; - } else { /* ERS */ - test_value = 4; - } if ((reg & M97236_JACKSW_MASK) == test_value) { schedule_delayed_work(&max97236->jack_work, diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 31652893fcd6..47ed21d7e7ec 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -298,7 +298,7 @@ config SND_SOC_TEGRA_RT5640 help Say Y or M here if you want to add support for SoC audio on Tegra boards using the ALC5640 codec. Currently, the supported boards - are Kai,Cardhu,Dalmore and Macallan. + are Kai,Cardhu and Dalmore. config MACH_HAS_SND_SOC_TEGRA_RT5645 bool |