hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: Push platform registration down into the card 

As part of the deprecation of snd_soc_device push the registration of
the platform down into the card structure.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2008-12-02 16:01:14 +00:00
parent 6308419a19
commit 87689d567a
31 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/soc.h
View File

@ -352,6 +352,7 @@ struct snd_soc_card {
struct snd_soc_device *socdev; struct snd_soc_device *socdev;
struct snd_soc_platform *platform;
struct delayed_work delayed_work; struct delayed_work delayed_work;
struct work_struct deferred_resume_work; struct work_struct deferred_resume_work;
}; };
@ -360,7 +361,6 @@ struct snd_soc_card {
struct snd_soc_device { struct snd_soc_device {
struct device *dev; struct device *dev;
struct snd_soc_card *card; struct snd_soc_card *card;
struct snd_soc_platform *platform;
struct snd_soc_codec *codec; struct snd_soc_codec *codec;
struct snd_soc_codec_device *codec_dev; struct snd_soc_codec_device *codec_dev;
void *codec_data; void *codec_data;

2
sound/soc/atmel/playpaq_wm8510.c
View File

@ -363,6 +363,7 @@ static struct snd_soc_dai_link playpaq_wm8510_dai = {
static struct snd_soc_card snd_soc_playpaq = { static struct snd_soc_card snd_soc_playpaq = {
.name = "LRS_PlayPaq_WM8510", .name = "LRS_PlayPaq_WM8510",
.platform = &at32_soc_platform,
.dai_link = &playpaq_wm8510_dai, .dai_link = &playpaq_wm8510_dai,
.num_links = 1, .num_links = 1,
}; };
@ -378,7 +379,6 @@ static struct wm8510_setup_data playpaq_wm8510_setup = {
static struct snd_soc_device playpaq_wm8510_snd_devdata = { static struct snd_soc_device playpaq_wm8510_snd_devdata = {
.card = &snd_soc_playpaq, .card = &snd_soc_playpaq,
.platform = &at32_soc_platform,
.codec_dev = &soc_codec_dev_wm8510, .codec_dev = &soc_codec_dev_wm8510,
.codec_data = &playpaq_wm8510_setup, .codec_data = &playpaq_wm8510_setup,
}; };

2
sound/soc/atmel/sam9g20_wm8731.c
View File

@ -244,6 +244,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = {
static struct snd_soc_card snd_soc_at91sam9g20ek = { static struct snd_soc_card snd_soc_at91sam9g20ek = {
.name = "WM8731", .name = "WM8731",
.platform = &atmel_soc_platform,
.dai_link = &at91sam9g20ek_dai, .dai_link = &at91sam9g20ek_dai,
.num_links = 1, .num_links = 1,
}; };
@ -255,7 +256,6 @@ static struct wm8731_setup_data at91sam9g20ek_wm8731_setup = {
static struct snd_soc_device at91sam9g20ek_snd_devdata = { static struct snd_soc_device at91sam9g20ek_snd_devdata = {
.card = &snd_soc_at91sam9g20ek, .card = &snd_soc_at91sam9g20ek,
.platform = &atmel_soc_platform,
.codec_dev = &soc_codec_dev_wm8731, .codec_dev = &soc_codec_dev_wm8731,
.codec_data = &at91sam9g20ek_wm8731_setup, .codec_data = &at91sam9g20ek_wm8731_setup,
}; };

2
sound/soc/blackfin/bf5xx-ad1980.c
View File

@ -69,13 +69,13 @@ static struct snd_soc_dai_link bf5xx_board_dai = {
static struct snd_soc_card bf5xx_board = { static struct snd_soc_card bf5xx_board = {
.name = "bf5xx-board", .name = "bf5xx-board",
.platform = &bf5xx_ac97_soc_platform,
.dai_link = &bf5xx_board_dai, .dai_link = &bf5xx_board_dai,
.num_links = 1, .num_links = 1,
}; };
static struct snd_soc_device bf5xx_board_snd_devdata = { static struct snd_soc_device bf5xx_board_snd_devdata = {
.card = &bf5xx_board, .card = &bf5xx_board,
.platform = &bf5xx_ac97_soc_platform,
.codec_dev = &soc_codec_dev_ad1980, .codec_dev = &soc_codec_dev_ad1980,
}; };

2
sound/soc/blackfin/bf5xx-ad73311.c
View File

@ -192,6 +192,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai = {
static struct snd_soc_card bf5xx_ad73311 = { static struct snd_soc_card bf5xx_ad73311 = {
.name = "bf5xx_ad73311", .name = "bf5xx_ad73311",
.platform = &bf5xx_i2s_soc_platform,
.probe = bf5xx_probe, .probe = bf5xx_probe,
.dai_link = &bf5xx_ad73311_dai, .dai_link = &bf5xx_ad73311_dai,
.num_links = 1, .num_links = 1,
@ -199,7 +200,6 @@ static struct snd_soc_card bf5xx_ad73311 = {
static struct snd_soc_device bf5xx_ad73311_snd_devdata = { static struct snd_soc_device bf5xx_ad73311_snd_devdata = {
.card = &bf5xx_ad73311, .card = &bf5xx_ad73311,
.platform = &bf5xx_i2s_soc_platform,
.codec_dev = &soc_codec_dev_ad73311, .codec_dev = &soc_codec_dev_ad73311,
}; };

2
sound/soc/blackfin/bf5xx-ssm2602.c
View File

@ -137,13 +137,13 @@ static struct ssm2602_setup_data bf5xx_ssm2602_setup = {
static struct snd_soc_card bf5xx_ssm2602 = { static struct snd_soc_card bf5xx_ssm2602 = {
.name = "bf5xx_ssm2602", .name = "bf5xx_ssm2602",
.platform = &bf5xx_i2s_soc_platform,
.dai_link = &bf5xx_ssm2602_dai, .dai_link = &bf5xx_ssm2602_dai,
.num_links = 1, .num_links = 1,
}; };
static struct snd_soc_device bf5xx_ssm2602_snd_devdata = { static struct snd_soc_device bf5xx_ssm2602_snd_devdata = {
.card = &bf5xx_ssm2602, .card = &bf5xx_ssm2602,
.platform = &bf5xx_i2s_soc_platform,
.codec_dev = &soc_codec_dev_ssm2602, .codec_dev = &soc_codec_dev_ssm2602,
.codec_data = &bf5xx_ssm2602_setup, .codec_data = &bf5xx_ssm2602_setup,
}; };

2
sound/soc/davinci/davinci-evm.c
View File

@ -130,6 +130,7 @@ static struct snd_soc_dai_link evm_dai = {
/* davinci-evm audio machine driver */ /* davinci-evm audio machine driver */
static struct snd_soc_card snd_soc_card_evm = { static struct snd_soc_card snd_soc_card_evm = {
.name = "DaVinci EVM", .name = "DaVinci EVM",
.platform = &davinci_soc_platform,
.dai_link = &evm_dai, .dai_link = &evm_dai,
.num_links = 1, .num_links = 1,
}; };
@ -143,7 +144,6 @@ static struct aic3x_setup_data evm_aic3x_setup = {
/* evm audio subsystem */ /* evm audio subsystem */
static struct snd_soc_device evm_snd_devdata = { static struct snd_soc_device evm_snd_devdata = {
.card = &snd_soc_card_evm, .card = &snd_soc_card_evm,
.platform = &davinci_soc_platform,
.codec_dev = &soc_codec_dev_aic3x, .codec_dev = &soc_codec_dev_aic3x,
.codec_data = &evm_aic3x_setup, .codec_data = &evm_aic3x_setup,
}; };

2
sound/soc/davinci/davinci-i2s.c
View File

@ -112,7 +112,7 @@ static void davinci_mcbsp_start(struct snd_pcm_substream *substream)
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data; struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = socdev->card->platform;
u32 w; u32 w;
int ret; int ret;

2
sound/soc/davinci/davinci-sffsdr.c
View File

@ -76,6 +76,7 @@ static struct snd_soc_dai_link sffsdr_dai = {
/* davinci-sffsdr audio machine driver */ /* davinci-sffsdr audio machine driver */
static struct snd_soc_card snd_soc_sffsdr = { static struct snd_soc_card snd_soc_sffsdr = {
.name = "DaVinci SFFSDR", .name = "DaVinci SFFSDR",
.platform = &davinci_soc_platform,
.dai_link = &sffsdr_dai, .dai_link = &sffsdr_dai,
.num_links = 1, .num_links = 1,
}; };
@ -91,7 +92,6 @@ static struct pcm3008_setup_data sffsdr_pcm3008_setup = {
/* sffsdr audio subsystem */ /* sffsdr audio subsystem */
static struct snd_soc_device sffsdr_snd_devdata = { static struct snd_soc_device sffsdr_snd_devdata = {
.card = &snd_soc_sffsdr, .card = &snd_soc_sffsdr,
.platform = &davinci_soc_platform,
.codec_dev = &soc_codec_dev_pcm3008, .codec_dev = &soc_codec_dev_pcm3008,
.codec_data = &sffsdr_pcm3008_setup, .codec_data = &sffsdr_pcm3008_setup,
}; };

2
sound/soc/fsl/mpc8610_hpcd.c
View File

@ -467,7 +467,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
machine_data->sound_devdata.card = &mpc8610_hpcd_machine; machine_data->sound_devdata.card = &mpc8610_hpcd_machine;
machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270; machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270;
machine_data->sound_devdata.platform = &fsl_soc_platform; machine_data->machine.platform = &fsl_soc_platform;
sound_device->dev.platform_data = machine_data; sound_device->dev.platform_data = machine_data;

2
sound/soc/fsl/soc-of-simple.c
View File

@ -158,7 +158,7 @@ int of_snd_soc_register_platform(struct snd_soc_platform *platform,
of_soc->platform_node = node; of_soc->platform_node = node;
of_soc->dai_link.cpu_dai = cpu_dai; of_soc->dai_link.cpu_dai = cpu_dai;
of_soc->device.platform = platform; of_soc->card.platform = platform;
of_soc->card.name = of_soc->dai_link.cpu_dai->name; of_soc->card.name = of_soc->dai_link.cpu_dai->name;
/* Now try to register the SoC device */ /* Now try to register the SoC device */

2
sound/soc/omap/n810.c
View File

@ -288,6 +288,7 @@ static struct snd_soc_dai_link n810_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_n810 = { static struct snd_soc_card snd_soc_n810 = {
.name = "N810", .name = "N810",
.platform = &omap_soc_platform,
.dai_link = &n810_dai, .dai_link = &n810_dai,
.num_links = 1, .num_links = 1,
}; };
@ -303,7 +304,6 @@ static struct aic3x_setup_data n810_aic33_setup = {
/* Audio subsystem */ /* Audio subsystem */
static struct snd_soc_device n810_snd_devdata = { static struct snd_soc_device n810_snd_devdata = {
.card = &snd_soc_n810, .card = &snd_soc_n810,
.platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_aic3x, .codec_dev = &soc_codec_dev_aic3x,
.codec_data = &n810_aic33_setup, .codec_data = &n810_aic33_setup,
}; };

2
sound/soc/omap/omap2evm.c
View File

@ -93,6 +93,7 @@ static struct snd_soc_dai_link omap2evm_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_omap2evm = { static struct snd_soc_card snd_soc_omap2evm = {
.name = "omap2evm", .name = "omap2evm",
.platform = &omap_soc_platform,
.dai_link = &omap2evm_dai, .dai_link = &omap2evm_dai,
.num_links = 1, .num_links = 1,
}; };
@ -100,7 +101,6 @@ static struct snd_soc_card snd_soc_omap2evm = {
/* Audio subsystem */ /* Audio subsystem */
static struct snd_soc_device omap2evm_snd_devdata = { static struct snd_soc_device omap2evm_snd_devdata = {
.card = &snd_soc_omap2evm, .card = &snd_soc_omap2evm,
.platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_twl4030, .codec_dev = &soc_codec_dev_twl4030,
}; };

2
sound/soc/omap/omap3beagle.c
View File

@ -90,6 +90,7 @@ static struct snd_soc_dai_link omap3beagle_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_omap3beagle = { static struct snd_soc_card snd_soc_omap3beagle = {
.name = "omap3beagle", .name = "omap3beagle",
.platform = &omap_soc_platform,
.dai_link = &omap3beagle_dai, .dai_link = &omap3beagle_dai,
.num_links = 1, .num_links = 1,
}; };
@ -97,7 +98,6 @@ static struct snd_soc_card snd_soc_omap3beagle = {
/* Audio subsystem */ /* Audio subsystem */
static struct snd_soc_device omap3beagle_snd_devdata = { static struct snd_soc_device omap3beagle_snd_devdata = {
.card = &snd_soc_omap3beagle, .card = &snd_soc_omap3beagle,
.platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_twl4030, .codec_dev = &soc_codec_dev_twl4030,
}; };

2
sound/soc/omap/osk5912.c
View File

@ -145,6 +145,7 @@ static struct snd_soc_dai_link osk_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_card_osk = { static struct snd_soc_card snd_soc_card_osk = {
.name = "OSK5912", .name = "OSK5912",
.platform = &omap_soc_platform,
.dai_link = &osk_dai, .dai_link = &osk_dai,
.num_links = 1, .num_links = 1,
}; };
@ -152,7 +153,6 @@ static struct snd_soc_card snd_soc_card_osk = {
/* Audio subsystem */ /* Audio subsystem */
static struct snd_soc_device osk_snd_devdata = { static struct snd_soc_device osk_snd_devdata = {
.card = &snd_soc_card_osk, .card = &snd_soc_card_osk,
.platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_tlv320aic23, .codec_dev = &soc_codec_dev_tlv320aic23,
}; };

2
sound/soc/omap/overo.c
View File

@ -90,6 +90,7 @@ static struct snd_soc_dai_link overo_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_card_overo = { static struct snd_soc_card snd_soc_card_overo = {
.name = "overo", .name = "overo",
.platform = &omap_soc_platform,
.dai_link = &overo_dai, .dai_link = &overo_dai,
.num_links = 1, .num_links = 1,
}; };
@ -97,7 +98,6 @@ static struct snd_soc_card snd_soc_card_overo = {
/* Audio subsystem */ /* Audio subsystem */
static struct snd_soc_device overo_snd_devdata = { static struct snd_soc_device overo_snd_devdata = {
.card = &snd_soc_card_overo, .card = &snd_soc_card_overo,
.platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_twl4030, .codec_dev = &soc_codec_dev_twl4030,
}; };

2
sound/soc/omap/sdp3430.c
View File

@ -93,6 +93,7 @@ static struct snd_soc_dai_link sdp3430_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_machine snd_soc_machine_sdp3430 = { static struct snd_soc_machine snd_soc_machine_sdp3430 = {
.name = "SDP3430", .name = "SDP3430",
.platform = &omap_soc_platform,
.dai_link = &sdp3430_dai, .dai_link = &sdp3430_dai,
.num_links = 1, .num_links = 1,
}; };
@ -100,7 +101,6 @@ static struct snd_soc_machine snd_soc_machine_sdp3430 = {
/* Audio subsystem */ /* Audio subsystem */
static struct snd_soc_device sdp3430_snd_devdata = { static struct snd_soc_device sdp3430_snd_devdata = {
.machine = &snd_soc_machine_sdp3430, .machine = &snd_soc_machine_sdp3430,
.platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_twl4030, .codec_dev = &soc_codec_dev_twl4030,
}; };

2
sound/soc/pxa/corgi.c
View File

@ -312,6 +312,7 @@ static struct snd_soc_dai_link corgi_dai = {
/* corgi audio machine driver */ /* corgi audio machine driver */
static struct snd_soc_card snd_soc_corgi = { static struct snd_soc_card snd_soc_corgi = {
.name = "Corgi", .name = "Corgi",
.platform = &pxa2xx_soc_platform,
.dai_link = &corgi_dai, .dai_link = &corgi_dai,
.num_links = 1, .num_links = 1,
}; };
@ -325,7 +326,6 @@ static struct wm8731_setup_data corgi_wm8731_setup = {
/* corgi audio subsystem */ /* corgi audio subsystem */
static struct snd_soc_device corgi_snd_devdata = { static struct snd_soc_device corgi_snd_devdata = {
.card = &snd_soc_corgi, .card = &snd_soc_corgi,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm8731, .codec_dev = &soc_codec_dev_wm8731,
.codec_data = &corgi_wm8731_setup, .codec_data = &corgi_wm8731_setup,
}; };

2
sound/soc/pxa/e800_wm9712.c
View File

@ -42,13 +42,13 @@ static struct snd_soc_dai_link e800_dai[] = {
static struct snd_soc_card e800 = { static struct snd_soc_card e800 = {
.name = "Toshiba e800", .name = "Toshiba e800",
.platform = &pxa2xx_soc_platform,
.dai_link = e800_dai, .dai_link = e800_dai,
.num_links = ARRAY_SIZE(e800_dai), .num_links = ARRAY_SIZE(e800_dai),
}; };
static struct snd_soc_device e800_snd_devdata = { static struct snd_soc_device e800_snd_devdata = {
.card = &e800, .card = &e800,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm9712, .codec_dev = &soc_codec_dev_wm9712,
}; };

2
sound/soc/pxa/em-x270.c
View File

@ -54,13 +54,13 @@ static struct snd_soc_dai_link em_x270_dai[] = {
static struct snd_soc_card em_x270 = { static struct snd_soc_card em_x270 = {
.name = "EM-X270", .name = "EM-X270",
.platform = &pxa2xx_soc_platform,
.dai_link = em_x270_dai, .dai_link = em_x270_dai,
.num_links = ARRAY_SIZE(em_x270_dai), .num_links = ARRAY_SIZE(em_x270_dai),
}; };
static struct snd_soc_device em_x270_snd_devdata = { static struct snd_soc_device em_x270_snd_devdata = {
.card = &em_x270, .card = &em_x270,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm9712, .codec_dev = &soc_codec_dev_wm9712,
}; };

2
sound/soc/pxa/palm27x.c
View File

@ -191,13 +191,13 @@ static struct snd_soc_dai_link palm27x_dai[] = {
static struct snd_soc_card palm27x_asoc = { static struct snd_soc_card palm27x_asoc = {
.name = "Palm/PXA27x", .name = "Palm/PXA27x",
.platform = &pxa2xx_soc_platform,
.dai_link = palm27x_dai, .dai_link = palm27x_dai,
.num_links = ARRAY_SIZE(palm27x_dai), .num_links = ARRAY_SIZE(palm27x_dai),
}; };
static struct snd_soc_device palm27x_snd_devdata = { static struct snd_soc_device palm27x_snd_devdata = {
.card = &palm27x_asoc, .card = &palm27x_asoc,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm9712, .codec_dev = &soc_codec_dev_wm9712,
}; };

2
sound/soc/pxa/poodle.c
View File

@ -278,6 +278,7 @@ static struct snd_soc_dai_link poodle_dai = {
/* poodle audio machine driver */ /* poodle audio machine driver */
static struct snd_soc_card snd_soc_poodle = { static struct snd_soc_card snd_soc_poodle = {
.name = "Poodle", .name = "Poodle",
.platform = &pxa2xx_soc_platform,
.dai_link = &poodle_dai, .dai_link = &poodle_dai,
.num_links = 1, .num_links = 1,
}; };
@ -291,7 +292,6 @@ static struct wm8731_setup_data poodle_wm8731_setup = {
/* poodle audio subsystem */ /* poodle audio subsystem */
static struct snd_soc_device poodle_snd_devdata = { static struct snd_soc_device poodle_snd_devdata = {
.card = &snd_soc_poodle, .card = &snd_soc_poodle,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm8731, .codec_dev = &soc_codec_dev_wm8731,
.codec_data = &poodle_wm8731_setup, .codec_data = &poodle_wm8731_setup,
}; };

2
sound/soc/pxa/spitz.c
View File

@ -321,6 +321,7 @@ static struct snd_soc_dai_link spitz_dai = {
/* spitz audio machine driver */ /* spitz audio machine driver */
static struct snd_soc_card snd_soc_spitz = { static struct snd_soc_card snd_soc_spitz = {
.name = "Spitz", .name = "Spitz",
.platform = &pxa2xx_soc_platform,
.dai_link = &spitz_dai, .dai_link = &spitz_dai,
.num_links = 1, .num_links = 1,
}; };
@ -334,7 +335,6 @@ static struct wm8750_setup_data spitz_wm8750_setup = {
/* spitz audio subsystem */ /* spitz audio subsystem */
static struct snd_soc_device spitz_snd_devdata = { static struct snd_soc_device spitz_snd_devdata = {
.card = &snd_soc_spitz, .card = &snd_soc_spitz,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm8750, .codec_dev = &soc_codec_dev_wm8750,
.codec_data = &spitz_wm8750_setup, .codec_data = &spitz_wm8750_setup,
}; };

2
sound/soc/pxa/tosa.c
View File

@ -252,6 +252,7 @@ static int tosa_remove(struct platform_device *dev)
static struct snd_soc_card tosa = { static struct snd_soc_card tosa = {
.name = "Tosa", .name = "Tosa",
.platform = &pxa2xx_soc_platform,
.dai_link = tosa_dai, .dai_link = tosa_dai,
.num_links = ARRAY_SIZE(tosa_dai), .num_links = ARRAY_SIZE(tosa_dai),
.probe = tosa_probe, .probe = tosa_probe,
@ -260,7 +261,6 @@ static struct snd_soc_card tosa = {
static struct snd_soc_device tosa_snd_devdata = { static struct snd_soc_device tosa_snd_devdata = {
.card = &tosa, .card = &tosa,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm9712, .codec_dev = &soc_codec_dev_wm9712,
}; };

2
sound/soc/pxa/zylonite.c
View File

@ -175,13 +175,13 @@ static struct snd_soc_dai_link zylonite_dai[] = {
static struct snd_soc_card zylonite = { static struct snd_soc_card zylonite = {
.name = "Zylonite", .name = "Zylonite",
.platform = &pxa2xx_soc_platform,
.dai_link = zylonite_dai, .dai_link = zylonite_dai,
.num_links = ARRAY_SIZE(zylonite_dai), .num_links = ARRAY_SIZE(zylonite_dai),
}; };
static struct snd_soc_device zylonite_snd_ac97_devdata = { static struct snd_soc_device zylonite_snd_ac97_devdata = {
.card = &zylonite, .card = &zylonite,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm9713, .codec_dev = &soc_codec_dev_wm9713,
}; };

2
sound/soc/s3c24xx/ln2440sbc_alc650.c
View File

@ -40,13 +40,13 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
static struct snd_soc_card ln2440sbc = { static struct snd_soc_card ln2440sbc = {
.name = "LN2440SBC", .name = "LN2440SBC",
.platform = &s3c24xx_soc_platform,
.dai_link = ln2440sbc_dai, .dai_link = ln2440sbc_dai,
.num_links = ARRAY_SIZE(ln2440sbc_dai), .num_links = ARRAY_SIZE(ln2440sbc_dai),
}; };
static struct snd_soc_device ln2440sbc_snd_ac97_devdata = { static struct snd_soc_device ln2440sbc_snd_ac97_devdata = {
.card = &ln2440sbc, .card = &ln2440sbc,
.platform = &s3c24xx_soc_platform,
.codec_dev = &soc_codec_dev_ac97, .codec_dev = &soc_codec_dev_ac97,
}; };

2
sound/soc/s3c24xx/neo1973_wm8753.c
View File

@ -580,6 +580,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
static struct snd_soc_card neo1973 = { static struct snd_soc_card neo1973 = {
.name = "neo1973", .name = "neo1973",
.platform = &s3c24xx_soc_platform,
.dai_link = neo1973_dai, .dai_link = neo1973_dai,
.num_links = ARRAY_SIZE(neo1973_dai), .num_links = ARRAY_SIZE(neo1973_dai),
}; };
@ -591,7 +592,6 @@ static struct wm8753_setup_data neo1973_wm8753_setup = {
static struct snd_soc_device neo1973_snd_devdata = { static struct snd_soc_device neo1973_snd_devdata = {
.card = &neo1973, .card = &neo1973,
.platform = &s3c24xx_soc_platform,
.codec_dev = &soc_codec_dev_wm8753, .codec_dev = &soc_codec_dev_wm8753,
.codec_data = &neo1973_wm8753_setup, .codec_data = &neo1973_wm8753_setup,
}; };

2
sound/soc/s3c24xx/s3c24xx_uda134x.c
View File

@ -234,6 +234,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
static struct snd_soc_card snd_soc_s3c24xx_uda134x = { static struct snd_soc_card snd_soc_s3c24xx_uda134x = {
.name = "S3C24XX_UDA134X", .name = "S3C24XX_UDA134X",
.platform = &s3c24xx_soc_platform,
.dai_link = &s3c24xx_uda134x_dai_link, .dai_link = &s3c24xx_uda134x_dai_link,
.num_links = 1, .num_links = 1,
}; };
@ -271,7 +272,6 @@ static struct uda134x_platform_data s3c24xx_uda134x = {
static struct snd_soc_device s3c24xx_uda134x_snd_devdata = { static struct snd_soc_device s3c24xx_uda134x_snd_devdata = {
.card = &snd_soc_s3c24xx_uda134x, .card = &snd_soc_s3c24xx_uda134x,
.platform = &s3c24xx_soc_platform,
.codec_dev = &soc_codec_dev_uda134x, .codec_dev = &soc_codec_dev_uda134x,
.codec_data = &s3c24xx_uda134x, .codec_data = &s3c24xx_uda134x,
}; };

2
sound/soc/s3c24xx/smdk2443_wm9710.c
View File

@ -36,13 +36,13 @@ static struct snd_soc_dai_link smdk2443_dai[] = {
static struct snd_soc_card smdk2443 = { static struct snd_soc_card smdk2443 = {
.name = "SMDK2443", .name = "SMDK2443",
.platform = &s3c24xx_soc_platform,
.dai_link = smdk2443_dai, .dai_link = smdk2443_dai,
.num_links = ARRAY_SIZE(smdk2443_dai), .num_links = ARRAY_SIZE(smdk2443_dai),
}; };
static struct snd_soc_device smdk2443_snd_ac97_devdata = { static struct snd_soc_device smdk2443_snd_ac97_devdata = {
.card = &smdk2443, .card = &smdk2443,
.platform = &s3c24xx_soc_platform,
.codec_dev = &soc_codec_dev_ac97, .codec_dev = &soc_codec_dev_ac97,
}; };

2
sound/soc/sh/sh7760-ac97.c
View File

@ -40,13 +40,13 @@ static struct snd_soc_dai_link sh7760_ac97_dai = {
static struct snd_soc_card sh7760_ac97_soc_machine = { static struct snd_soc_card sh7760_ac97_soc_machine = {
.name = "SH7760 AC97", .name = "SH7760 AC97",
.platform = &sh7760_soc_platform,
.dai_link = &sh7760_ac97_dai, .dai_link = &sh7760_ac97_dai,
.num_links = 1, .num_links = 1,
}; };
static struct snd_soc_device sh7760_ac97_snd_devdata = { static struct snd_soc_device sh7760_ac97_snd_devdata = {
.card = &sh7760_ac97_soc_machine, .card = &sh7760_ac97_soc_machine,
.platform = &sh7760_soc_platform,
.codec_dev = &soc_codec_dev_ac97, .codec_dev = &soc_codec_dev_ac97,
}; };

44
sound/soc/soc-core.c
View File

@ -109,9 +109,10 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_card *card = socdev->card;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_dai_link *machine = rtd->dai; struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_dai *cpu_dai = machine->cpu_dai; struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai; struct snd_soc_dai *codec_dai = machine->codec_dai;
int ret = 0; int ret = 0;
@ -302,7 +303,7 @@ static int soc_codec_close(struct snd_pcm_substream *substream)
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_card *card = socdev->card; struct snd_soc_card *card = socdev->card;
struct snd_soc_dai_link *machine = rtd->dai; struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_dai *cpu_dai = machine->cpu_dai; struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai; struct snd_soc_dai *codec_dai = machine->codec_dai;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->codec;
@ -370,7 +371,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_card *card = socdev->card; struct snd_soc_card *card = socdev->card;
struct snd_soc_dai_link *machine = rtd->dai; struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_dai *cpu_dai = machine->cpu_dai; struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai; struct snd_soc_dai *codec_dai = machine->codec_dai;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->codec;
@ -464,7 +465,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_dai_link *machine = rtd->dai; struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_card *card = socdev->card;
struct snd_soc_platform *platform = card->platform;
struct snd_soc_dai *cpu_dai = machine->cpu_dai; struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai; struct snd_soc_dai *codec_dai = machine->codec_dai;
int ret = 0; int ret = 0;
@ -534,7 +536,8 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_dai_link *machine = rtd->dai; struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_card *card = socdev->card;
struct snd_soc_platform *platform = card->platform;
struct snd_soc_dai *cpu_dai = machine->cpu_dai; struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai; struct snd_soc_dai *codec_dai = machine->codec_dai;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->codec;
@ -568,8 +571,9 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev; struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_card *card= socdev->card;
struct snd_soc_dai_link *machine = rtd->dai; struct snd_soc_dai_link *machine = rtd->dai;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_dai *cpu_dai = machine->cpu_dai; struct snd_soc_dai *cpu_dai = machine->cpu_dai;
struct snd_soc_dai *codec_dai = machine->codec_dai; struct snd_soc_dai *codec_dai = machine->codec_dai;
int ret; int ret;
@ -610,7 +614,7 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_card *card = socdev->card; struct snd_soc_card *card = socdev->card;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_codec_device *codec_dev = socdev->codec_dev; struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->codec;
int i; int i;
@ -686,7 +690,7 @@ static void soc_resume_deferred(struct work_struct *work)
struct snd_soc_card, struct snd_soc_card,
deferred_resume_work); deferred_resume_work);
struct snd_soc_device *socdev = card->socdev; struct snd_soc_device *socdev = card->socdev;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_codec_device *codec_dev = socdev->codec_dev; struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->codec;
struct platform_device *pdev = to_platform_device(socdev->dev); struct platform_device *pdev = to_platform_device(socdev->dev);
@ -770,7 +774,7 @@ static int soc_probe(struct platform_device *pdev)
int ret = 0, i; int ret = 0, i;
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_card *card = socdev->card; struct snd_soc_card *card = socdev->card;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_codec_device *codec_dev = socdev->codec_dev; struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
/* Bodge while we push things out of socdev */ /* Bodge while we push things out of socdev */
@ -835,7 +839,7 @@ static int soc_remove(struct platform_device *pdev)
int i; int i;
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_card *card = socdev->card; struct snd_soc_card *card = socdev->card;
struct snd_soc_platform *platform = socdev->platform; struct snd_soc_platform *platform = card->platform;
struct snd_soc_codec_device *codec_dev = socdev->codec_dev; struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
run_delayed_work(&card->delayed_work); run_delayed_work(&card->delayed_work);
@ -875,6 +879,8 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
struct snd_soc_dai_link *dai_link, int num) struct snd_soc_dai_link *dai_link, int num)
{ {
struct snd_soc_codec *codec = socdev->codec; struct snd_soc_codec *codec = socdev->codec;
struct snd_soc_card *card = socdev->card;
struct snd_soc_platform *platform = card->platform;
struct snd_soc_dai *codec_dai = dai_link->codec_dai; struct snd_soc_dai *codec_dai = dai_link->codec_dai;
struct snd_soc_dai *cpu_dai = dai_link->cpu_dai; struct snd_soc_dai *cpu_dai = dai_link->cpu_dai;
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
@ -910,13 +916,13 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
dai_link->pcm = pcm; dai_link->pcm = pcm;
pcm->private_data = rtd; pcm->private_data = rtd;
soc_pcm_ops.mmap = socdev->platform->pcm_ops->mmap; soc_pcm_ops.mmap = platform->pcm_ops->mmap;
soc_pcm_ops.pointer = socdev->platform->pcm_ops->pointer; soc_pcm_ops.pointer = platform->pcm_ops->pointer;
soc_pcm_ops.ioctl = socdev->platform->pcm_ops->ioctl; soc_pcm_ops.ioctl = platform->pcm_ops->ioctl;
soc_pcm_ops.copy = socdev->platform->pcm_ops->copy; soc_pcm_ops.copy = platform->pcm_ops->copy;
soc_pcm_ops.silence = socdev->platform->pcm_ops->silence; soc_pcm_ops.silence = platform->pcm_ops->silence;
soc_pcm_ops.ack = socdev->platform->pcm_ops->ack; soc_pcm_ops.ack = platform->pcm_ops->ack;
soc_pcm_ops.page = socdev->platform->pcm_ops->page; soc_pcm_ops.page = platform->pcm_ops->page;
if (playback) if (playback)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &soc_pcm_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &soc_pcm_ops);
@ -924,14 +930,14 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
if (capture) if (capture)
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &soc_pcm_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &soc_pcm_ops);
ret = socdev->platform->pcm_new(codec->card, codec_dai, pcm); ret = platform->pcm_new(codec->card, codec_dai, pcm);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "asoc: platform pcm constructor failed\n"); printk(KERN_ERR "asoc: platform pcm constructor failed\n");
kfree(rtd); kfree(rtd);
return ret; return ret;
} }
pcm->private_free = socdev->platform->pcm_free; pcm->private_free = platform->pcm_free;
printk(KERN_INFO "asoc: %s <-> %s mapping ok\n", codec_dai->name, printk(KERN_INFO "asoc: %s <-> %s mapping ok\n", codec_dai->name,
cpu_dai->name); cpu_dai->name);
return ret; return ret;