Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e94be5f3628565d0968d668341d9dd468700516d

Authored by Liam Girdwood
Committed by Takashi Iwai
1 parent 3342b9680f
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ASoC: fsl - fix build error in pcm030-audio-fabric.c 

Fix build error:-

sound/soc/fsl/pcm030-audio-fabric.c:27:33: fatal error:
sound/soc-of-simple.h: No such file or directory

Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 1 additions and 2 deletions Inline Diff

sound/soc/fsl/pcm030-audio-fabric.c
Diff comments   View file @ e94be5f
1 /* 1 /*
2 * Phytec pcm030 driver for the PSC of the Freescale MPC52xx 2 * Phytec pcm030 driver for the PSC of the Freescale MPC52xx
3 * configured as AC97 interface 3 * configured as AC97 interface
4 * 4 *
5 * Copyright 2008 Jon Smirl, Digispeaker 5 * Copyright 2008 Jon Smirl, Digispeaker
6 * Author: Jon Smirl <jonsmirl@gmail.com> 6 * Author: Jon Smirl <jonsmirl@gmail.com>
7 * 7 *
8 * This file is licensed under the terms of the GNU General Public License 8 * This file is licensed under the terms of the GNU General Public License
9 * version 2. This program is licensed "as is" without any warranty of any 9 * version 2. This program is licensed "as is" without any warranty of any
10 * kind, whether express or implied. 10 * kind, whether express or implied.
11 */ 11 */
12 12
13 #include <linux/init.h> 13 #include <linux/init.h>
14 #include <linux/module.h> 14 #include <linux/module.h>
15 #include <linux/interrupt.h> 15 #include <linux/interrupt.h>
16 #include <linux/device.h> 16 #include <linux/device.h>
17 #include <linux/delay.h> 17 #include <linux/delay.h>
18 #include <linux/of_device.h> 18 #include <linux/of_device.h>
19 #include <linux/of_platform.h> 19 #include <linux/of_platform.h>
20 #include <linux/dma-mapping.h> 20 #include <linux/dma-mapping.h>
21 21
22 #include <sound/core.h> 22 #include <sound/core.h>
23 #include <sound/pcm.h> 23 #include <sound/pcm.h>
24 #include <sound/pcm_params.h> 24 #include <sound/pcm_params.h>
25 #include <sound/initval.h> 25 #include <sound/initval.h>
26 #include <sound/soc.h> 26 #include <sound/soc.h>
27 #include <sound/soc-of-simple.h>
28 27
29 #include "mpc5200_dma.h" 28 #include "mpc5200_dma.h"
30 #include "mpc5200_psc_ac97.h" 29 #include "mpc5200_psc_ac97.h"
31 #include "../codecs/wm9712.h" 30 #include "../codecs/wm9712.h"
32 31
33 #define DRV_NAME "pcm030-audio-fabric" 32 #define DRV_NAME "pcm030-audio-fabric"
34 33
35 static struct snd_soc_card card; 34 static struct snd_soc_card card;
36 35
37 static struct snd_soc_dai_link pcm030_fabric_dai[] = { 36 static struct snd_soc_dai_link pcm030_fabric_dai[] = {
38 { 37 {
39 .name = "AC97", 38 .name = "AC97",
40 .stream_name = "AC97 Analog", 39 .stream_name = "AC97 Analog",
41 .codec_dai_name = "wm9712-hifi", 40 .codec_dai_name = "wm9712-hifi",
42 .cpu_dai_name = "mpc5200-psc-ac97.0", 41 .cpu_dai_name = "mpc5200-psc-ac97.0",
43 .platform_name = "mpc5200-pcm-audio", 42 .platform_name = "mpc5200-pcm-audio",
44 .codec_name = "wm9712-codec", 43 .codec_name = "wm9712-codec",
45 }, 44 },
46 { 45 {
47 .name = "AC97", 46 .name = "AC97",
48 .stream_name = "AC97 IEC958", 47 .stream_name = "AC97 IEC958",
49 .codec_dai_name = "wm9712-aux", 48 .codec_dai_name = "wm9712-aux",
50 .cpu_dai_name = "mpc5200-psc-ac97.1", 49 .cpu_dai_name = "mpc5200-psc-ac97.1",
51 .platform_name = "mpc5200-pcm-audio", 50 .platform_name = "mpc5200-pcm-audio",
52 ..codec_name = "wm9712-codec", 51 .codec_name = "wm9712-codec",
53 }, 52 },
54 }; 53 };
55 54
56 static __init int pcm030_fabric_init(void) 55 static __init int pcm030_fabric_init(void)
57 { 56 {
58 struct platform_device *pdev; 57 struct platform_device *pdev;
59 int rc; 58 int rc;
60 59
61 if (!of_machine_is_compatible("phytec,pcm030")) 60 if (!of_machine_is_compatible("phytec,pcm030"))
62 return -ENODEV; 61 return -ENODEV;
63 62
64 63
65 card.name = "pcm030"; 64 card.name = "pcm030";
66 card.dai_link = pcm030_fabric_dai; 65 card.dai_link = pcm030_fabric_dai;
67 card.num_links = ARRAY_SIZE(pcm030_fabric_dai); 66 card.num_links = ARRAY_SIZE(pcm030_fabric_dai);
68 67
69 pdev = platform_device_alloc("soc-audio", 1); 68 pdev = platform_device_alloc("soc-audio", 1);
70 if (!pdev) { 69 if (!pdev) {
71 pr_err("pcm030_fabric_init: platform_device_alloc() failed\n"); 70 pr_err("pcm030_fabric_init: platform_device_alloc() failed\n");
72 return -ENODEV; 71 return -ENODEV;
73 } 72 }
74 73
75 platform_set_drvdata(pdev, &card); 74 platform_set_drvdata(pdev, &card);
76 75
77 rc = platform_device_add(pdev); 76 rc = platform_device_add(pdev);
78 if (rc) { 77 if (rc) {
79 pr_err("pcm030_fabric_init: platform_device_add() failed\n"); 78 pr_err("pcm030_fabric_init: platform_device_add() failed\n");
80 return -ENODEV; 79 return -ENODEV;
81 } 80 }
82 return 0; 81 return 0;
83 } 82 }
84 83
85 module_init(pcm030_fabric_init); 84 module_init(pcm030_fabric_init);
86 85
87 86
88 MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>"); 87 MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>");
89 MODULE_DESCRIPTION(DRV_NAME ": mpc5200 pcm030 fabric driver"); 88 MODULE_DESCRIPTION(DRV_NAME ": mpc5200 pcm030 fabric driver");
90 MODULE_LICENSE("GPL"); 89 MODULE_LICENSE("GPL");
91 90
92 91