~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

TOMOYO Linux Cross Reference
Linux/sound/soc/fsl/pcm030-audio-fabric.c

Version: ~ [ linux-6.12-rc7 ] ~ [ linux-6.11.7 ] ~ [ linux-6.10.14 ] ~ [ linux-6.9.12 ] ~ [ linux-6.8.12 ] ~ [ linux-6.7.12 ] ~ [ linux-6.6.60 ] ~ [ linux-6.5.13 ] ~ [ linux-6.4.16 ] ~ [ linux-6.3.13 ] ~ [ linux-6.2.16 ] ~ [ linux-6.1.116 ] ~ [ linux-6.0.19 ] ~ [ linux-5.19.17 ] ~ [ linux-5.18.19 ] ~ [ linux-5.17.15 ] ~ [ linux-5.16.20 ] ~ [ linux-5.15.171 ] ~ [ linux-5.14.21 ] ~ [ linux-5.13.19 ] ~ [ linux-5.12.19 ] ~ [ linux-5.11.22 ] ~ [ linux-5.10.229 ] ~ [ linux-5.9.16 ] ~ [ linux-5.8.18 ] ~ [ linux-5.7.19 ] ~ [ linux-5.6.19 ] ~ [ linux-5.5.19 ] ~ [ linux-5.4.285 ] ~ [ linux-5.3.18 ] ~ [ linux-5.2.21 ] ~ [ linux-5.1.21 ] ~ [ linux-5.0.21 ] ~ [ linux-4.20.17 ] ~ [ linux-4.19.323 ] ~ [ linux-4.18.20 ] ~ [ linux-4.17.19 ] ~ [ linux-4.16.18 ] ~ [ linux-4.15.18 ] ~ [ linux-4.14.336 ] ~ [ linux-4.13.16 ] ~ [ linux-4.12.14 ] ~ [ linux-4.11.12 ] ~ [ linux-4.10.17 ] ~ [ linux-4.9.337 ] ~ [ linux-4.4.302 ] ~ [ linux-3.10.108 ] ~ [ linux-2.6.32.71 ] ~ [ linux-2.6.0 ] ~ [ linux-2.4.37.11 ] ~ [ unix-v6-master ] ~ [ ccs-tools-1.8.9 ] ~ [ policy-sample ] ~
Architecture: ~ [ i386 ] ~ [ alpha ] ~ [ m68k ] ~ [ mips ] ~ [ ppc ] ~ [ sparc ] ~ [ sparc64 ] ~

Diff markup

Differences between /sound/soc/fsl/pcm030-audio-fabric.c (Version linux-6.12-rc7) and /sound/soc/fsl/pcm030-audio-fabric.c (Version linux-4.13.16)


  1 // SPDX-License-Identifier: GPL-2.0            !!   1 /*
  2 //                                             !!   2  * Phytec pcm030 driver for the PSC of the Freescale MPC52xx
  3 // Phytec pcm030 driver for the PSC of the Fre !!   3  * configured as AC97 interface
  4 // configured as AC97 interface                !!   4  *
  5 //                                             !!   5  * Copyright 2008 Jon Smirl, Digispeaker
  6 // Copyright 2008 Jon Smirl, Digispeaker       !!   6  * Author: Jon Smirl <jonsmirl@gmail.com>
  7 // Author: Jon Smirl <jonsmirl@gmail.com>      !!   7  *
                                                   >>   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
                                                   >>  10  * kind, whether express or implied.
                                                   >>  11  */
  8                                                    12 
  9 #include <linux/init.h>                            13 #include <linux/init.h>
 10 #include <linux/module.h>                          14 #include <linux/module.h>
 11 #include <linux/device.h>                          15 #include <linux/device.h>
 12 #include <linux/of.h>                          !!  16 #include <linux/of_device.h>
                                                   >>  17 #include <linux/of_platform.h>
 13                                                    18 
 14 #include <sound/soc.h>                             19 #include <sound/soc.h>
 15                                                    20 
 16 #include "mpc5200_dma.h"                           21 #include "mpc5200_dma.h"
 17                                                    22 
 18 #define DRV_NAME "pcm030-audio-fabric"             23 #define DRV_NAME "pcm030-audio-fabric"
 19                                                    24 
 20 struct pcm030_audio_data {                         25 struct pcm030_audio_data {
 21         struct snd_soc_card *card;                 26         struct snd_soc_card *card;
 22         struct platform_device *codec_device;      27         struct platform_device *codec_device;
 23 };                                                 28 };
 24                                                    29 
 25 SND_SOC_DAILINK_DEFS(analog,                   << 
 26         DAILINK_COMP_ARRAY(COMP_CPU("mpc5200-p << 
 27         DAILINK_COMP_ARRAY(COMP_CODEC("wm9712- << 
 28         DAILINK_COMP_ARRAY(COMP_EMPTY()));     << 
 29                                                << 
 30 SND_SOC_DAILINK_DEFS(iec958,                   << 
 31         DAILINK_COMP_ARRAY(COMP_CPU("mpc5200-p << 
 32         DAILINK_COMP_ARRAY(COMP_CODEC("wm9712- << 
 33         DAILINK_COMP_ARRAY(COMP_EMPTY()));     << 
 34                                                << 
 35 static struct snd_soc_dai_link pcm030_fabric_d     30 static struct snd_soc_dai_link pcm030_fabric_dai[] = {
 36 {                                                  31 {
 37         .name = "AC97.0",                          32         .name = "AC97.0",
 38         .stream_name = "AC97 Analog",              33         .stream_name = "AC97 Analog",
 39         SND_SOC_DAILINK_REG(analog),           !!  34         .codec_dai_name = "wm9712-hifi",
                                                   >>  35         .cpu_dai_name = "mpc5200-psc-ac97.0",
                                                   >>  36         .codec_name = "wm9712-codec",
 40 },                                                 37 },
 41 {                                                  38 {
 42         .name = "AC97.1",                          39         .name = "AC97.1",
 43         .stream_name = "AC97 IEC958",              40         .stream_name = "AC97 IEC958",
 44         SND_SOC_DAILINK_REG(iec958),           !!  41         .codec_dai_name = "wm9712-aux",
                                                   >>  42         .cpu_dai_name = "mpc5200-psc-ac97.1",
                                                   >>  43         .codec_name = "wm9712-codec",
 45 },                                                 44 },
 46 };                                                 45 };
 47                                                    46 
 48 static struct snd_soc_card pcm030_card = {         47 static struct snd_soc_card pcm030_card = {
 49         .name = "pcm030",                          48         .name = "pcm030",
 50         .owner = THIS_MODULE,                      49         .owner = THIS_MODULE,
 51         .dai_link = pcm030_fabric_dai,             50         .dai_link = pcm030_fabric_dai,
 52         .num_links = ARRAY_SIZE(pcm030_fabric_     51         .num_links = ARRAY_SIZE(pcm030_fabric_dai),
 53 };                                                 52 };
 54                                                    53 
 55 static int pcm030_fabric_probe(struct platform     54 static int pcm030_fabric_probe(struct platform_device *op)
 56 {                                                  55 {
 57         struct device_node *np = op->dev.of_no     56         struct device_node *np = op->dev.of_node;
 58         struct device_node *platform_np;           57         struct device_node *platform_np;
 59         struct snd_soc_card *card = &pcm030_ca     58         struct snd_soc_card *card = &pcm030_card;
 60         struct pcm030_audio_data *pdata;           59         struct pcm030_audio_data *pdata;
 61         struct snd_soc_dai_link *dai_link;     << 
 62         int ret;                                   60         int ret;
 63         int i;                                     61         int i;
 64                                                    62 
 65         if (!of_machine_is_compatible("phytec,     63         if (!of_machine_is_compatible("phytec,pcm030"))
 66                 return -ENODEV;                    64                 return -ENODEV;
 67                                                    65 
 68         pdata = devm_kzalloc(&op->dev, sizeof(     66         pdata = devm_kzalloc(&op->dev, sizeof(struct pcm030_audio_data),
 69                              GFP_KERNEL);          67                              GFP_KERNEL);
 70         if (!pdata)                                68         if (!pdata)
 71                 return -ENOMEM;                    69                 return -ENOMEM;
 72                                                    70 
 73         card->dev = &op->dev;                      71         card->dev = &op->dev;
 74                                                    72 
 75         pdata->card = card;                        73         pdata->card = card;
 76                                                    74 
 77         platform_np = of_parse_phandle(np, "as     75         platform_np = of_parse_phandle(np, "asoc-platform", 0);
 78         if (!platform_np) {                        76         if (!platform_np) {
 79                 dev_err(&op->dev, "ac97 not re     77                 dev_err(&op->dev, "ac97 not registered\n");
 80                 return -ENODEV;                    78                 return -ENODEV;
 81         }                                          79         }
 82                                                    80 
 83         for_each_card_prelinks(card, i, dai_li !!  81         for (i = 0; i < card->num_links; i++)
 84                 dai_link->platforms->of_node = !!  82                 card->dai_link[i].platform_of_node = platform_np;
 85                                                    83 
 86         ret = request_module("snd-soc-wm9712")     84         ret = request_module("snd-soc-wm9712");
 87         if (ret)                                   85         if (ret)
 88                 dev_err(&op->dev, "request_mod     86                 dev_err(&op->dev, "request_module returned: %d\n", ret);
 89                                                    87 
 90         pdata->codec_device = platform_device_     88         pdata->codec_device = platform_device_alloc("wm9712-codec", -1);
 91         if (!pdata->codec_device)                  89         if (!pdata->codec_device)
 92                 dev_err(&op->dev, "platform_de     90                 dev_err(&op->dev, "platform_device_alloc() failed\n");
 93                                                    91 
 94         ret = platform_device_add(pdata->codec     92         ret = platform_device_add(pdata->codec_device);
 95         if (ret) {                             !!  93         if (ret)
 96                 dev_err(&op->dev, "platform_de     94                 dev_err(&op->dev, "platform_device_add() failed: %d\n", ret);
 97                 platform_device_put(pdata->cod << 
 98         }                                      << 
 99                                                    95 
100         ret = snd_soc_register_card(card);         96         ret = snd_soc_register_card(card);
101         if (ret) {                             !!  97         if (ret)
102                 dev_err(&op->dev, "snd_soc_reg     98                 dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret);
103                 platform_device_unregister(pda << 
104         }                                      << 
105                                                    99 
106         platform_set_drvdata(op, pdata);          100         platform_set_drvdata(op, pdata);
107         return ret;                            << 
108                                                   101 
                                                   >> 102         return ret;
109 }                                                 103 }
110                                                   104 
111 static void pcm030_fabric_remove(struct platfo !! 105 static int pcm030_fabric_remove(struct platform_device *op)
112 {                                                 106 {
113         struct pcm030_audio_data *pdata = plat    107         struct pcm030_audio_data *pdata = platform_get_drvdata(op);
                                                   >> 108         int ret;
114                                                   109 
115         snd_soc_unregister_card(pdata->card);  !! 110         ret = snd_soc_unregister_card(pdata->card);
116         platform_device_unregister(pdata->code    111         platform_device_unregister(pdata->codec_device);
                                                   >> 112 
                                                   >> 113         return ret;
117 }                                                 114 }
118                                                   115 
119 static const struct of_device_id pcm030_audio_    116 static const struct of_device_id pcm030_audio_match[] = {
120         { .compatible = "phytec,pcm030-audio-f    117         { .compatible = "phytec,pcm030-audio-fabric", },
121         {}                                        118         {}
122 };                                                119 };
123 MODULE_DEVICE_TABLE(of, pcm030_audio_match);      120 MODULE_DEVICE_TABLE(of, pcm030_audio_match);
124                                                   121 
125 static struct platform_driver pcm030_fabric_dr    122 static struct platform_driver pcm030_fabric_driver = {
126         .probe          = pcm030_fabric_probe,    123         .probe          = pcm030_fabric_probe,
127         .remove         = pcm030_fabric_remove    124         .remove         = pcm030_fabric_remove,
128         .driver         = {                       125         .driver         = {
129                 .name   = DRV_NAME,               126                 .name   = DRV_NAME,
130                 .of_match_table    = pcm030_au    127                 .of_match_table    = pcm030_audio_match,
131         },                                        128         },
132 };                                                129 };
133                                                   130 
134 module_platform_driver(pcm030_fabric_driver);     131 module_platform_driver(pcm030_fabric_driver);
135                                                   132 
136                                                   133 
137 MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>"    134 MODULE_AUTHOR("Jon Smirl <jonsmirl@gmail.com>");
138 MODULE_DESCRIPTION(DRV_NAME ": mpc5200 pcm030     135 MODULE_DESCRIPTION(DRV_NAME ": mpc5200 pcm030 fabric driver");
139 MODULE_LICENSE("GPL");                            136 MODULE_LICENSE("GPL");
140                                                   137 
141                                                   138 

~ [ source navigation ] ~ [ diff markup ] ~ [ identifier search ] ~

kernel.org | git.kernel.org | LWN.net | Project Home | SVN repository | Mail admin

Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.

sflogo.php