diff options
| author | Mark Brown <broonie@kernel.org> | 2018-04-27 12:58:05 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-04-27 12:58:05 +0200 |
| commit | 444d0c2ddae79c399ac6575ca4d94fa4976f2534 (patch) | |
| tree | b14f83539a069ad2433355d72353906e74439307 /sound/soc/omap | |
| parent | ASoC: mt6797: switch to SPDX license tag (diff) | |
| parent | ASoC: omap: n810: Correct the cpu_dai, platform and codec name (diff) | |
| download | linux-444d0c2ddae79c399ac6575ca4d94fa4976f2534.tar.xz linux-444d0c2ddae79c399ac6575ca4d94fa4976f2534.zip | |
Merge branch 'asoc-4.17' into asoc-4.18 n810 dependencies
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/n810.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 71e5f31fa306..3a2c448a26dd 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -231,8 +231,8 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Ext Spk", NULL, "LLOUT"}, {"Ext Spk", NULL, "RLOUT"}, - {"DMic Rate 64", NULL, "Mic Bias"}, - {"Mic Bias", NULL, "DMic"}, + {"DMic Rate 64", NULL, "DMic"}, + {"DMic", NULL, "Mic Bias"}, }; static const char *spk_function[] = {"Off", "On"}; @@ -257,9 +257,9 @@ static const struct snd_kcontrol_new aic33_n810_controls[] = { static struct snd_soc_dai_link n810_dai = { .name = "TLV320AIC33", .stream_name = "AIC33", - .cpu_dai_name = "omap-mcbsp.2", - .platform_name = "omap-mcbsp.2", - .codec_name = "tlv320aic3x-codec.2-0018", + .cpu_dai_name = "48076000.mcbsp", + .platform_name = "48076000.mcbsp", + .codec_name = "tlv320aic3x-codec.1-0018", .codec_dai_name = "tlv320aic3x-hifi", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, |