Merge branch 'for-3.0' into for-3.1

diff --combined sound/soc/codecs/wm8994.c
index dc2350e6350b6c9489f8132c0507462e8c43ad15,c2fc0356c2a44daac0c9a3fffd96e0119cd4ba3e..70a68fd96c46441487c83980660a389c6dac1207
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -1713,6 -1713,8 +1713,8 @@@ static int _wm8994_set_fll(struct snd_s
                snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset,
                                    WM8994_FLL1_ENA | WM8994_FLL1_FRAC,
                                    reg);
+ 
+               msleep(5);
        }
  
        wm8994->fll[id].in = freq_in;
@@@ -2903,7 -2905,6 +2905,7 @@@ static int wm8994_codec_probe(struct sn
                        wm8994->hubs.dcs_codes = -5;
                        wm8994->hubs.hp_startup_mode = 1;
                        wm8994->hubs.dcs_readback_mode = 1;
 +                      wm8994->hubs.series_startup = 1;
                        break;
                default:
                        wm8994->hubs.dcs_readback_mode = 1;

diff --combined sound/soc/tegra/tegra_i2s.c
index 2e5685512db0a12837d8859c85f72c5fb5a18d2d,95f03c10b4f7401da2686d2b6ff0d904e749ea87..f36b9969cfeceb1ca9a14054e67472ea109fbc18
--- 1/sound/soc/tegra/tegra_i2s.c
--- 2/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@@ -222,12 -222,18 +222,18 @@@ static int tegra_i2s_hw_params(struct s
        if (i2sclock % (2 * srate))
                reg |= TEGRA_I2S_TIMING_NON_SYM_ENABLE;
  
+       if (!i2s->clk_refs)
+               clk_enable(i2s->clk_i2s);
+ 
        tegra_i2s_write(i2s, TEGRA_I2S_TIMING, reg);
  
        tegra_i2s_write(i2s, TEGRA_I2S_FIFO_SCR,
                TEGRA_I2S_FIFO_SCR_FIFO2_ATN_LVL_FOUR_SLOTS |
                TEGRA_I2S_FIFO_SCR_FIFO1_ATN_LVL_FOUR_SLOTS);
  
+       if (!i2s->clk_refs)
+               clk_disable(i2s->clk_i2s);
+ 
        return 0;
  }
  
@@@ -348,6 -354,7 +354,6 @@@ struct snd_soc_dai_driver tegra_i2s_dai
  static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
  {
        struct tegra_i2s * i2s;
 -      char clk_name[12]; /* tegra-i2s.0 */
        struct resource *mem, *memregion, *dmareq;
        int ret;
  
@@@ -382,7 -389,8 +388,7 @@@
        }
        dev_set_drvdata(&pdev->dev, i2s);
  
 -      snprintf(clk_name, sizeof(clk_name), DRV_NAME ".%d", pdev->id);
 -      i2s->clk_i2s = clk_get_sys(clk_name, NULL);
 +      i2s->clk_i2s = clk_get(&pdev->dev, NULL);
        if (IS_ERR(i2s->clk_i2s)) {
                dev_err(&pdev->dev, "Can't retrieve i2s clock\n");
                ret = PTR_ERR(i2s->clk_i2s);