Skip to content

Commit

Permalink
ASoC: mediatek: mt8192-mt6359: move headset_jack to card specific data
Browse files Browse the repository at this point in the history
Moves headset_jack to card specific data.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20210120080850.699354-2-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Tzung-Bi Shih authored and Mark Brown committed Jan 20, 2021
1 parent 6b050d4 commit 4e37528
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
#define RT5682_CODEC_DAI "rt5682-aif1"
#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,
struct snd_pcm_hw_params *params)
Expand Down Expand Up @@ -305,7 +307,8 @@ static int mt8192_rt5682_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_component *cmpnt_codec =
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;

ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",
Expand Down Expand Up @@ -1038,6 +1041,7 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
int ret, i;
struct snd_soc_dai_link *dai_link;
const struct of_device_id *match;
struct mt8192_mt6359_priv *priv;

platform_node = of_parse_phandle(pdev->dev.of_node,
"mediatek,platform", 0);
Expand Down Expand Up @@ -1083,6 +1087,11 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
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);
if (ret) {
dev_err(&pdev->dev, "init gpio error %d\n", ret);
Expand Down

0 comments on commit 4e37528

Please sign in to comment.