Commit 4e37528a authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Mark Brown

ASoC: mediatek: mt8192-mt6359: move headset_jack to card specific data

Moves headset_jack to card specific data.
Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20210120080850.699354-2-tzungbi@google.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6b050d45
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
#define RT5682_CODEC_DAI "rt5682-aif1" #define RT5682_CODEC_DAI "rt5682-aif1"
#define RT5682_DEV0_NAME "rt5682.1-001a" #define RT5682_DEV0_NAME "rt5682.1-001a"
static struct snd_soc_jack headset_jack; struct mt8192_mt6359_priv {
struct snd_soc_jack headset_jack;
};
static int mt8192_rt1015_i2s_hw_params(struct snd_pcm_substream *substream, static int mt8192_rt1015_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
...@@ -305,7 +307,8 @@ static int mt8192_rt5682_init(struct snd_soc_pcm_runtime *rtd) ...@@ -305,7 +307,8 @@ static int mt8192_rt5682_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_component *cmpnt_codec = struct snd_soc_component *cmpnt_codec =
asoc_rtd_to_codec(rtd, 0)->component; asoc_rtd_to_codec(rtd, 0)->component;
struct snd_soc_jack *jack = &headset_jack; struct mt8192_mt6359_priv *priv = snd_soc_card_get_drvdata(rtd->card);
struct snd_soc_jack *jack = &priv->headset_jack;
int ret; int ret;
ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",
...@@ -1038,6 +1041,7 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) ...@@ -1038,6 +1041,7 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
int ret, i; int ret, i;
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
const struct of_device_id *match; const struct of_device_id *match;
struct mt8192_mt6359_priv *priv;
platform_node = of_parse_phandle(pdev->dev.of_node, platform_node = of_parse_phandle(pdev->dev.of_node,
"mediatek,platform", 0); "mediatek,platform", 0);
...@@ -1083,6 +1087,11 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) ...@@ -1083,6 +1087,11 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
dai_link->platforms->of_node = platform_node; dai_link->platforms->of_node = platform_node;
} }
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
snd_soc_card_set_drvdata(card, priv);
ret = mt8192_afe_gpio_init(&pdev->dev); ret = mt8192_afe_gpio_init(&pdev->dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "init gpio error %d\n", ret); dev_err(&pdev->dev, "init gpio error %d\n", ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment