Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: tegra+wm8903: remove non-DT support for Seaboard

In kernel 3.6, Seaboard will only be supported when booting using device
tree; the board files are being removed. Hence, remove the non-DT support
for Seaboard and derivatives Kaen and Aebl from the audio driver.

Harmony is the only remaining board supported by this driver when not
using DT. This support is currently scheduled for removal in 3.7.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Stephen Warren and committed by
Mark Brown
b350ecbe 14df415a

+2 -46
+2 -46
sound/soc/tegra/tegra_wm8903.c
··· 28 28 * 29 29 */ 30 30 31 - #include <asm/mach-types.h> 32 - 33 31 #include <linux/module.h> 34 32 #include <linux/platform_device.h> 35 33 #include <linux/slab.h> ··· 194 196 {"IN1L", NULL, "Mic Jack"}, 195 197 }; 196 198 197 - static const struct snd_soc_dapm_route seaboard_audio_map[] = { 198 - {"Headphone Jack", NULL, "HPOUTR"}, 199 - {"Headphone Jack", NULL, "HPOUTL"}, 200 - {"Int Spk", NULL, "ROP"}, 201 - {"Int Spk", NULL, "RON"}, 202 - {"Int Spk", NULL, "LOP"}, 203 - {"Int Spk", NULL, "LON"}, 204 - {"Mic Jack", NULL, "MICBIAS"}, 205 - {"IN1R", NULL, "Mic Jack"}, 206 - }; 207 - 208 - static const struct snd_soc_dapm_route kaen_audio_map[] = { 209 - {"Headphone Jack", NULL, "HPOUTR"}, 210 - {"Headphone Jack", NULL, "HPOUTL"}, 211 - {"Int Spk", NULL, "ROP"}, 212 - {"Int Spk", NULL, "RON"}, 213 - {"Int Spk", NULL, "LOP"}, 214 - {"Int Spk", NULL, "LON"}, 215 - {"Mic Jack", NULL, "MICBIAS"}, 216 - {"IN2R", NULL, "Mic Jack"}, 217 - }; 218 - 219 - static const struct snd_soc_dapm_route aebl_audio_map[] = { 220 - {"Headphone Jack", NULL, "HPOUTR"}, 221 - {"Headphone Jack", NULL, "HPOUTL"}, 222 - {"Int Spk", NULL, "LINEOUTR"}, 223 - {"Int Spk", NULL, "LINEOUTL"}, 224 - {"Mic Jack", NULL, "MICBIAS"}, 225 - {"IN1R", NULL, "Mic Jack"}, 226 - }; 227 - 228 199 static const struct snd_kcontrol_new tegra_wm8903_controls[] = { 229 200 SOC_DAPM_PIN_SWITCH("Int Spk"), 230 201 }; ··· 344 377 tegra_wm8903_dai.platform_of_node = 345 378 tegra_wm8903_dai.cpu_dai_of_node; 346 379 } else { 347 - if (machine_is_harmony()) { 348 - card->dapm_routes = harmony_audio_map; 349 - card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map); 350 - } else if (machine_is_seaboard()) { 351 - card->dapm_routes = seaboard_audio_map; 352 - card->num_dapm_routes = ARRAY_SIZE(seaboard_audio_map); 353 - } else if (machine_is_kaen()) { 354 - card->dapm_routes = kaen_audio_map; 355 - card->num_dapm_routes = ARRAY_SIZE(kaen_audio_map); 356 - } else { 357 - card->dapm_routes = aebl_audio_map; 358 - card->num_dapm_routes = ARRAY_SIZE(aebl_audio_map); 359 - } 380 + card->dapm_routes = harmony_audio_map; 381 + card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map); 360 382 } 361 383 362 384 if (gpio_is_valid(pdata->gpio_spkr_en)) {