diff options
Diffstat (limited to 'sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c')
| -rw-r--r-- | sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c index cfca6bdee834..970b980a81e6 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c @@ -11,10 +11,10 @@ #include <linux/module.h> #include <linux/of_device.h> #include <linux/pm_runtime.h> +#include <sound/jack.h> #include <sound/pcm_params.h> #include <sound/soc.h> -#include "../../codecs/da7219-aad.h" #include "../../codecs/da7219.h" #include "../../codecs/mt6358.h" #include "../common/mtk-afe-platform-driver.h" @@ -100,7 +100,7 @@ static int mt8186_da7219_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(cmpnt_codec, &priv->headset_jack); + snd_soc_component_set_jack(cmpnt_codec, &priv->headset_jack, NULL); return 0; } @@ -192,7 +192,7 @@ static int mt8186_mt6366_da7219_max98357_hdmi_init(struct snd_soc_pcm_runtime *r struct mt8186_mt6366_da7219_max98357_priv *priv = soc_card_data->mach_priv; int ret; - ret = mt8186_dai_i2s_set_share(afe, "I2S3", "I2S2"); + ret = mt8186_dai_i2s_set_share(afe, "I2S2", "I2S3"); if (ret) { dev_err(rtd->dev, "Failed to set up shared clocks\n"); return ret; @@ -1161,6 +1161,7 @@ static const struct of_device_id mt8186_mt6366_da7219_max98357_dt_match[] = { }, {} }; +MODULE_DEVICE_TABLE(of, mt8186_mt6366_da7219_max98357_dt_match); #endif static struct platform_driver mt8186_mt6366_da7219_max98357_driver = { |