Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: sound/soc/tegra/harmony.c

Issue 6580011: CHROMIUM: ASoC: Tegra: Harmony: Allow driver to run on Ventana too. (Closed)
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sound/soc/tegra/Kconfig ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * harmony.c - Harmony machine ASoC driver 2 * harmony.c - Harmony machine ASoC driver
3 * 3 *
4 * Author: Stephen Warren <swarren@nvidia.com> 4 * Author: Stephen Warren <swarren@nvidia.com>
5 * Copyright (C) 2010-2011 - NVIDIA, Inc. 5 * Copyright (C) 2010-2011 - NVIDIA, Inc.
6 * 6 *
7 * Based on code copyright/by: 7 * Based on code copyright/by:
8 * 8 *
9 * (c) 2009, 2010 Nvidia Graphics Pvt. Ltd. 9 * (c) 2009, 2010 Nvidia Graphics Pvt. Ltd.
10 * 10 *
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 .num_links = 1, 287 .num_links = 1,
288 }; 288 };
289 289
290 static __devinit int tegra_snd_harmony_probe(struct platform_device *pdev) 290 static __devinit int tegra_snd_harmony_probe(struct platform_device *pdev)
291 { 291 {
292 struct snd_soc_card *card = &snd_soc_harmony; 292 struct snd_soc_card *card = &snd_soc_harmony;
293 struct tegra_harmony *harmony; 293 struct tegra_harmony *harmony;
294 struct harmony_audio_platform_data *pdata; 294 struct harmony_audio_platform_data *pdata;
295 int ret; 295 int ret;
296 296
297 » if (!machine_is_harmony()) { 297 » if (!machine_is_harmony() && !machine_is_ventana()) {
298 dev_err(&pdev->dev, "Not running on Tegra Harmony!\n"); 298 dev_err(&pdev->dev, "Not running on Tegra Harmony!\n");
299 return -ENODEV; 299 return -ENODEV;
300 } 300 }
301 301
302 pdata = pdev->dev.platform_data; 302 pdata = pdev->dev.platform_data;
303 if (!pdata) { 303 if (!pdata) {
304 dev_err(&pdev->dev, "no platform data supplied\n"); 304 dev_err(&pdev->dev, "no platform data supplied\n");
305 return -EINVAL; 305 return -EINVAL;
306 } 306 }
307 307
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 static void __exit snd_tegra_harmony_exit(void) 384 static void __exit snd_tegra_harmony_exit(void)
385 { 385 {
386 platform_driver_unregister(&tegra_snd_harmony_driver); 386 platform_driver_unregister(&tegra_snd_harmony_driver);
387 } 387 }
388 module_exit(snd_tegra_harmony_exit); 388 module_exit(snd_tegra_harmony_exit);
389 389
390 MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>"); 390 MODULE_AUTHOR("Stephen Warren <swarren@nvidia.com>");
391 MODULE_DESCRIPTION("Harmony machine ASoC driver"); 391 MODULE_DESCRIPTION("Harmony machine ASoC driver");
392 MODULE_LICENSE("GPL"); 392 MODULE_LICENSE("GPL");
393 MODULE_ALIAS("platform:" DRV_NAME); 393 MODULE_ALIAS("platform:" DRV_NAME);
OLDNEW
« no previous file with comments | « sound/soc/tegra/Kconfig ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698