Merge remote-tracking branches 'asoc/topic/rx51', 'asoc/topic/samsung', 'asoc/topic...

diff --combined sound/soc/codecs/Kconfig
index ef2c70e77d918149b7f65c5d4f74e744e1600159,8349f982a586841a3ac9e7b0526af05699c7deaf,8349f982a586841a3ac9e7b0526af05699c7deaf,8349f982a586841a3ac9e7b0526af05699c7deaf,8349f982a586841a3ac9e7b0526af05699c7deaf,c63ee0e37188394881aab2d3b3983a09b0e5cb24..3190eed43c38d8145536d1804f7686b108f97641
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
--- 6/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@ -525,7 -525,7 -525,7 -525,7 -525,7 -525,7 +525,7 @@@@@@@ config SND_SOC_RT567
      
      config SND_SOC_RT5677_SPI
        tristate
 -----  default SND_SOC_RT5677
 +++++  default SND_SOC_RT5677 && SPI
      
      #Freescale sgtl5000 codec
      config SND_SOC_SGTL5000
@@@@@@@ -580,7 -580,7 -580,7 -580,7 -580,7 -580,9 +580,9 @@@@@@@ config SND_SOC_SSM456
        depends on I2C
      
      config SND_SOC_STA32X
-----   tristate
+++++   tristate "STA326, STA328 and STA329 speaker amplifier"
+++++   depends on I2C
+++++   select REGMAP_I2C
      
      config SND_SOC_STA350
        tristate "STA350 speaker amplifier"

diff --combined sound/soc/generic/simple-card.c
index 7fe3009b1c43c63c055c4f9ea8f2b25376ad5c7b,fb9240fdc9b70095d364e3e90e14c16653ca4aff,fb9240fdc9b70095d364e3e90e14c16653ca4aff,fb9240fdc9b70095d364e3e90e14c16653ca4aff,cb3998d96cca3803431d7c9a0ac970f59b51a2a2,fb9240fdc9b70095d364e3e90e14c16653ca4aff..f7c6734bd5daee1dafd76ba8b6feafa05b2a6c52
--- 1/sound/soc/generic/simple-card.c
--- 2/sound/soc/generic/simple-card.c
--- 3/sound/soc/generic/simple-card.c
--- 4/sound/soc/generic/simple-card.c
--- 5/sound/soc/generic/simple-card.c
--- 6/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@@@@@@ -39,6 -39,6 -39,6 -39,6 -39,37 -39,6 +39,37 @@@@@@@ struct simple_card_data 
      #define simple_priv_to_link(priv, i) ((priv)->snd_card.dai_link + i)
      #define simple_priv_to_props(priv, i) ((priv)->dai_props + i)
      
++++ +static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
++++ +{
++++ +  struct snd_soc_pcm_runtime *rtd = substream->private_data;
++++ +  struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
++++ +  struct simple_dai_props *dai_props =
++++ +          &priv->dai_props[rtd - rtd->card->rtd];
++++ +  int ret;
++++ +
++++ +  ret = clk_prepare_enable(dai_props->cpu_dai.clk);
++++ +  if (ret)
++++ +          return ret;
++++ +  
++++ +  ret = clk_prepare_enable(dai_props->codec_dai.clk);
++++ +  if (ret)
++++ +          clk_disable_unprepare(dai_props->cpu_dai.clk);
++++ +
++++ +  return ret;
++++ +}
++++ +
++++ +static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream)
++++ +{
++++ +  struct snd_soc_pcm_runtime *rtd = substream->private_data;
++++ +  struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);
++++ +  struct simple_dai_props *dai_props =
++++ +          &priv->dai_props[rtd - rtd->card->rtd];
++++ +
++++ +  clk_disable_unprepare(dai_props->cpu_dai.clk);
++++ +
++++ +  clk_disable_unprepare(dai_props->codec_dai.clk);
++++ +}
++++ +
      static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
                                      struct snd_pcm_hw_params *params)
      {
@@@@@@@ -58,6 -58,6 -58,6 -58,6 -89,8 -58,6 +89,8 @@@@@@@
      }
      
      static struct snd_soc_ops asoc_simple_card_ops = {
++++ +  .startup = asoc_simple_card_startup,
++++ +  .shutdown = asoc_simple_card_shutdown,
        .hw_params = asoc_simple_card_hw_params,
      };
      
@@@@@@@ -219,6 -219,6 -219,6 -219,6 -252,7 -219,6 +252,7 @@@@@@@ asoc_simple_card_sub_parse_of(struct de
                }
      
                dai->sysclk = clk_get_rate(clk);
++++ +          dai->clk = clk;
        } else if (!of_property_read_u32(np, "system-clock-frequency", &val)) {
                dai->sysclk = val;
        } else {
@@@@@@@ -452,8 -452,9 -452,9 -452,9 -486,9 -452,9 +486,8 @@@@@@@ static int asoc_simple_card_parse_of(st
      }
      
      /* Decrease the reference count of the device nodes */
 -----static int asoc_simple_card_unref(struct platform_device *pdev)
 +++++static int asoc_simple_card_unref(struct snd_soc_card *card)
      {
 -----  struct snd_soc_card *card = platform_get_drvdata(pdev);
        struct snd_soc_dai_link *dai_link;
        int num_links;
      
@@@@@@@ -555,7 -556,7 -556,7 -556,7 -590,7 -556,7 +589,7 @@@@@@@ static int asoc_simple_card_probe(struc
                return ret;
      
      err:
 -----  asoc_simple_card_unref(pdev);
 +++++  asoc_simple_card_unref(&priv->snd_card);
        return ret;
      }
      
@@@@@@@ -571,7 -572,7 -572,7 -572,7 -606,7 -572,7 +605,7 @@@@@@@ static int asoc_simple_card_remove(stru
                snd_soc_jack_free_gpios(&simple_card_mic_jack, 1,
                                        &simple_card_mic_jack_gpio);
      
 -----  return asoc_simple_card_unref(pdev);
 +++++  return asoc_simple_card_unref(card);
      }
      
      static const struct of_device_id asoc_simple_of_match[] = {

diff --combined sound/soc/sh/fsi.c
index d49f25f9efd3d14779f8af39ac4a13653d92a617,8869971d7884b93e463db07bb304f23c71b3b2c3,8869971d7884b93e463db07bb304f23c71b3b2c3,422faa93972b5e7419db47e20c658f085379de5a,8869971d7884b93e463db07bb304f23c71b3b2c3,8869971d7884b93e463db07bb304f23c71b3b2c3..b87b22e88e43decf2d8e66c84ce411f2c97224fa
--- 1/sound/soc/sh/fsi.c
--- 2/sound/soc/sh/fsi.c
--- 3/sound/soc/sh/fsi.c
--- 4/sound/soc/sh/fsi.c
--- 5/sound/soc/sh/fsi.c
--- 6/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@@@@@@ -820,9 -820,12 -820,12 -820,12 -820,12 -820,12 +820,9 @@@@@@@ static int fsi_clk_enable(struct devic
                        return ret;
                }
      
 -----          if (clock->xck)
 -----                  clk_enable(clock->xck);
 -----          if (clock->ick)
 -----                  clk_enable(clock->ick);
 -----          if (clock->div)
 -----                  clk_enable(clock->div);
 +++++          clk_enable(clock->xck);
 +++++          clk_enable(clock->ick);
 +++++          clk_enable(clock->div);
      
                clock->count++;
        }
@@@@@@@ -1762,11 -1765,11 -1765,11 -1765,6 -1765,11 -1765,11 +1762,6 @@@@@@@ static struct snd_pcm_ops fsi_pcm_ops 
      #define PREALLOC_BUFFER           (32 * 1024)
      #define PREALLOC_BUFFER_MAX       (32 * 1024)
      
--- --static void fsi_pcm_free(struct snd_pcm *pcm)
--- --{
--- --  snd_pcm_lib_preallocate_free_for_all(pcm);
--- --}
--- --
      static int fsi_pcm_new(struct snd_soc_pcm_runtime *rtd)
      {
        return snd_pcm_lib_preallocate_pages_for_all(
@@@@@@@ -1818,7 -1821,7 -1821,7 -1816,6 -1821,7 -1821,7 +1813,6 @@@@@@@ static struct snd_soc_dai_driver fsi_so
      static struct snd_soc_platform_driver fsi_soc_platform = {
        .ops            = &fsi_pcm_ops,
        .pcm_new        = fsi_pcm_new,
--- --  .pcm_free       = fsi_pcm_free,
      };
      
      static const struct snd_soc_component_driver fsi_soc_component = {