Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc...

diff --combined sound/soc/mediatek/mt8173-max98090.c
index 684e8a78bed0640310e0b54e292df725b409fe22,684e8a78bed0640310e0b54e292df725b409fe22,684e8a78bed0640310e0b54e292df725b409fe22,72d66cbed88ddea8829d6175919bd1f60d580b57,684e8a78bed0640310e0b54e292df725b409fe22,684e8a78bed0640310e0b54e292df725b409fe22..71a1a35047bafd085881efd5369f5275bf9a050f
--- 1/sound/soc/mediatek/mt8173-max98090.c
--- 2/sound/soc/mediatek/mt8173-max98090.c
--- 3/sound/soc/mediatek/mt8173-max98090.c
--- 4/sound/soc/mediatek/mt8173-max98090.c
--- 5/sound/soc/mediatek/mt8173-max98090.c
--- 6/sound/soc/mediatek/mt8173-max98090.c
+++ b/sound/soc/mediatek/mt8173-max98090.c
@@@@@@@ -103,6 -103,6 -103,6 -103,7 -103,6 -103,6 +103,6 @@@@@@@ static struct snd_soc_dai_link mt8173_m
                .name = "MAX98090 Playback",
                .stream_name = "MAX98090 Playback",
                .cpu_dai_name = "DL1",
   -            .platform_name = "11220000.mt8173-afe-pcm",
                .codec_name = "snd-soc-dummy",
                .codec_dai_name = "snd-soc-dummy-dai",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@@@@@@ -113,6 -113,6 -113,6 -114,7 -113,6 -113,6 +113,6 @@@@@@@
                .name = "MAX98090 Capture",
                .stream_name = "MAX98090 Capture",
                .cpu_dai_name = "VUL",
   -            .platform_name = "11220000.mt8173-afe-pcm",
                .codec_name = "snd-soc-dummy",
                .codec_dai_name = "snd-soc-dummy-dai",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@@@@@@ -123,6 -123,6 -123,6 -125,7 -123,6 -123,6 +123,6 @@@@@@@
        {
                .name = "Codec",
                .cpu_dai_name = "I2S",
   -            .platform_name = "11220000.mt8173-afe-pcm",
                .no_pcm = 1,
                .codec_dai_name = "HiFi",
                .init = mt8173_max98090_init,
@@@@@@@ -136,7 -136,7 -136,7 -139,6 -136,7 -136,7 +136,7 @@@@@@@
      
      static struct snd_soc_card mt8173_max98090_card = {
        .name = "mt8173-max98090",
   +    .owner = THIS_MODULE,
        .dai_link = mt8173_max98090_dais,
        .num_links = ARRAY_SIZE(mt8173_max98090_dais),
        .controls = mt8173_max98090_controls,
@@@@@@@ -150,21 -150,21 -150,21 -152,9 -150,21 -150,21 +150,21 @@@@@@@
      static int mt8173_max98090_dev_probe(struct platform_device *pdev)
      {
        struct snd_soc_card *card = &mt8173_max98090_card;
   -    struct device_node *codec_node;
   +    struct device_node *codec_node, *platform_node;
        int ret, i;
      
   +    platform_node = of_parse_phandle(pdev->dev.of_node,
   +                                     "mediatek,platform", 0);
   +    if (!platform_node) {
   +            dev_err(&pdev->dev, "Property 'platform' missing or invalid\n");
   +            return -EINVAL;
   +    }
   +    for (i = 0; i < card->num_links; i++) {
   +            if (mt8173_max98090_dais[i].platform_name)
   +                    continue;
   +            mt8173_max98090_dais[i].platform_of_node = platform_node;
   +    }
   +  
        codec_node = of_parse_phandle(pdev->dev.of_node,
                                      "mediatek,audio-codec", 0);
        if (!codec_node) {
@@@@@@@ -179,21 -179,21 -179,21 -169,13 -179,21 -179,21 +179,13 @@@@@@@
        }
        card->dev = &pdev->dev;
      
--- --  ret = snd_soc_register_card(card);
+++ ++  ret = devm_snd_soc_register_card(&pdev->dev, card);
        if (ret)
                dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
                        __func__, ret);
        return ret;
      }
      
--- --static int mt8173_max98090_dev_remove(struct platform_device *pdev)
--- --{
--- --  struct snd_soc_card *card = platform_get_drvdata(pdev);
--- --
--- --  snd_soc_unregister_card(card);
--- --  return 0;
--- --}
--- --
      static const struct of_device_id mt8173_max98090_dt_match[] = {
        { .compatible = "mediatek,mt8173-max98090", },
        { }
@@@@@@@ -203,13 -203,13 -203,13 -185,13 -203,13 -203,13 +195,12 @@@@@@@ MODULE_DEVICE_TABLE(of, mt8173_max98090
      static struct platform_driver mt8173_max98090_driver = {
        .driver = {
                   .name = "mt8173-max98090",
   -               .owner = THIS_MODULE,
                   .of_match_table = mt8173_max98090_dt_match,
      #ifdef CONFIG_PM
                   .pm = &snd_soc_pm_ops,
      #endif
        },
        .probe = mt8173_max98090_dev_probe,
--- --  .remove = mt8173_max98090_dev_remove,
      };
      
      module_platform_driver(mt8173_max98090_driver);

diff --combined sound/soc/mediatek/mt8173-rt5650-rt5676.c
index 86cf9752f18a343791eaeeff8ca8ab9c2c4a83e8,86cf9752f18a343791eaeeff8ca8ab9c2c4a83e8,86cf9752f18a343791eaeeff8ca8ab9c2c4a83e8,bff96e4e8b5d0d5decbaba9f879882634f1c39bd,86cf9752f18a343791eaeeff8ca8ab9c2c4a83e8,86cf9752f18a343791eaeeff8ca8ab9c2c4a83e8..50ba538eccb3f771da9c08685d4e33aa0cbfa80b
--- 1/sound/soc/mediatek/mt8173-rt5650-rt5676.c
--- 2/sound/soc/mediatek/mt8173-rt5650-rt5676.c
--- 3/sound/soc/mediatek/mt8173-rt5650-rt5676.c
--- 4/sound/soc/mediatek/mt8173-rt5650-rt5676.c
--- 5/sound/soc/mediatek/mt8173-rt5650-rt5676.c
--- 6/sound/soc/mediatek/mt8173-rt5650-rt5676.c
+++ b/sound/soc/mediatek/mt8173-rt5650-rt5676.c
@@@@@@@ -138,6 -138,6 -138,6 -138,7 -138,6 -138,6 +138,6 @@@@@@@ static struct snd_soc_dai_link mt8173_r
                .name = "rt5650_rt5676 Playback",
                .stream_name = "rt5650_rt5676 Playback",
                .cpu_dai_name = "DL1",
   -            .platform_name = "11220000.mt8173-afe-pcm",
                .codec_name = "snd-soc-dummy",
                .codec_dai_name = "snd-soc-dummy-dai",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@@@@@@ -148,6 -148,6 -148,6 -149,7 -148,6 -148,6 +148,6 @@@@@@@
                .name = "rt5650_rt5676 Capture",
                .stream_name = "rt5650_rt5676 Capture",
                .cpu_dai_name = "VUL",
   -            .platform_name = "11220000.mt8173-afe-pcm",
                .codec_name = "snd-soc-dummy",
                .codec_dai_name = "snd-soc-dummy-dai",
                .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
@@@@@@@ -159,6 -159,6 -159,6 -161,7 -159,6 -159,6 +159,6 @@@@@@@
        {
                .name = "Codec",
                .cpu_dai_name = "I2S",
   -            .platform_name = "11220000.mt8173-afe-pcm",
                .no_pcm = 1,
                .codecs = mt8173_rt5650_rt5676_codecs,
                .num_codecs = 2,
@@@@@@@ -191,7 -191,7 -191,7 -194,6 -191,7 -191,7 +191,7 @@@@@@@ static struct snd_soc_codec_conf mt8173
      
      static struct snd_soc_card mt8173_rt5650_rt5676_card = {
        .name = "mtk-rt5650-rt5676",
   +    .owner = THIS_MODULE,
        .dai_link = mt8173_rt5650_rt5676_dais,
        .num_links = ARRAY_SIZE(mt8173_rt5650_rt5676_dais),
        .codec_conf = mt8173_rt5650_rt5676_codec_conf,
@@@@@@@ -207,21 -207,21 -207,21 -209,7 -207,21 -207,21 +207,21 @@@@@@@
      static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev)
      {
        struct snd_soc_card *card = &mt8173_rt5650_rt5676_card;
   -    int ret;
   +    struct device_node *platform_node;
   +    int i, ret;
   +  
   +    platform_node = of_parse_phandle(pdev->dev.of_node,
   +                                     "mediatek,platform", 0);
   +    if (!platform_node) {
   +            dev_err(&pdev->dev, "Property 'platform' missing or invalid\n");
   +            return -EINVAL;
   +    }
   +  
   +    for (i = 0; i < card->num_links; i++) {
   +            if (mt8173_rt5650_rt5676_dais[i].platform_name)
   +                    continue;
   +            mt8173_rt5650_rt5676_dais[i].platform_of_node = platform_node;
   +    }
      
        mt8173_rt5650_rt5676_codecs[0].of_node =
                of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 0);
@@@@@@@ -246,21 -246,21 -246,21 -234,13 -246,21 -246,21 +246,13 @@@@@@@
        card->dev = &pdev->dev;
        platform_set_drvdata(pdev, card);
      
--- --  ret = snd_soc_register_card(card);
+++ ++  ret = devm_snd_soc_register_card(&pdev->dev, card);
        if (ret)
                dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
                        __func__, ret);
        return ret;
      }
      
--- --static int mt8173_rt5650_rt5676_dev_remove(struct platform_device *pdev)
--- --{
--- --  struct snd_soc_card *card = platform_get_drvdata(pdev);
--- --
--- --  snd_soc_unregister_card(card);
--- --  return 0;
--- --}
--- --
      static const struct of_device_id mt8173_rt5650_rt5676_dt_match[] = {
        { .compatible = "mediatek,mt8173-rt5650-rt5676", },
        { }
@@@@@@@ -270,13 -270,13 -270,13 -250,13 -270,13 -270,13 +262,12 @@@@@@@ MODULE_DEVICE_TABLE(of, mt8173_rt5650_r
      static struct platform_driver mt8173_rt5650_rt5676_driver = {
        .driver = {
                   .name = "mtk-rt5650-rt5676",
   -               .owner = THIS_MODULE,
                   .of_match_table = mt8173_rt5650_rt5676_dt_match,
      #ifdef CONFIG_PM
                   .pm = &snd_soc_pm_ops,
      #endif
        },
        .probe = mt8173_rt5650_rt5676_dev_probe,
--- --  .remove = mt8173_rt5650_rt5676_dev_remove,
      };
      
      module_platform_driver(mt8173_rt5650_rt5676_driver);