diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2019-07-08 14:45:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-07-08 14:45:34 +0200 |
| commit | 3c53c6255d598db7084c5c3d7553d7200e857818 (patch) | |
| tree | 19a88468bd59118ac7f07ce730485211ca671ea5 /sound/soc/samsung/s3c24xx_simtec_hermes.c | |
| parent | Merge branch 'topic/hda-refresh-cleanup' into for-next (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/meson' into asoc-next (diff) | |
| download | linux-dev-3c53c6255d598db7084c5c3d7553d7200e857818.tar.xz linux-dev-3c53c6255d598db7084c5c3d7553d7200e857818.zip | |
Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.3
This is a very big update, mainly thanks to Morimoto-san's refactoring
work and some fairly large new drivers.
- Lots more work on moving towards a component based framework from
Morimoto-san.
- Support for force disconnecting muxes from Jerome Brunet.
- New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant
CX2072X, Realtek RT1011 and RT1308.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/samsung/s3c24xx_simtec_hermes.c')
| -rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_hermes.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c index e3528e74a338..ed0d1b8fa2d4 100644 --- a/sound/soc/samsung/s3c24xx_simtec_hermes.c +++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c @@ -63,14 +63,17 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd) return 0; } +SND_SOC_DAILINK_DEFS(tlv320aic33, + DAILINK_COMP_ARRAY(COMP_CPU("s3c24xx-iis")), + DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic3x-codec.0-001a", + "tlv320aic3x-hifi")), + DAILINK_COMP_ARRAY(COMP_PLATFORM("s3c24xx-iis"))); + static struct snd_soc_dai_link simtec_dai_aic33 = { .name = "tlv320aic33", .stream_name = "TLV320AIC33", - .codec_name = "tlv320aic3x-codec.0-001a", - .cpu_dai_name = "s3c24xx-iis", - .codec_dai_name = "tlv320aic3x-hifi", - .platform_name = "s3c24xx-iis", .init = simtec_hermes_init, + SND_SOC_DAILINK_REG(tlv320aic33), }; /* simtec audio machine driver */ |