CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/blackfin/bf5xx-tdm.c

 /*
  * File:         sound/soc/blackfin/bf5xx-tdm.c
  * Author:       Barry Song <Barry.Song@analog.com>
  *
  * Created:      Thurs June 04 2009
  * Description:  Blackfin I2S(TDM) CPU DAI driver
  *              Even though TDM mode can be as part of I2S DAI, but there
  *              are so much difference in configuration and data flow,
  *              it's very ugly to integrate I2S and TDM into a module
  *
@@ skipping 192 matching lines @@
                 } else
                         return -EINVAL;
         }
 
         return 0;
 }
 
 #ifdef CONFIG_PM
 static int bf5xx_tdm_suspend(struct snd_soc_dai *dai)
 {
-        struct sport_device *sport = dai->private_data;
+        struct sport_device *sport = snd_soc_dai_get_drvdata(dai);
 
         if (!dai->active)
                 return 0;
         if (dai->capture_active)
                 sport_rx_stop(sport);
         if (dai->playback_active)
                 sport_tx_stop(sport);
         return 0;
 }
 
 static int bf5xx_tdm_resume(struct snd_soc_dai *dai)
 {
         int ret;
         struct sport_device *sport = snd_soc_dai_get_drvdata(dai);
 
         if (!dai->active)
                 return 0;
 
         ret = sport_set_multichannel(sport, 8, 0xFF, 1);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
         }
 
-        ret = sport_config_rx(sport, IRFS, 0x1F, 0, 0);
+        ret = sport_config_rx(sport, 0, 0x1F, 0, 0);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
         }
 
-        ret = sport_config_tx(sport, ITFS, 0x1F, 0, 0);
+        ret = sport_config_tx(sport, 0, 0x1F, 0, 0);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
         }
 
         return 0;
 }
 
 #else
 #define bf5xx_tdm_suspend      NULL
@@ skipping 41 matching lines @@
         }
 
         /* SPORT works in TDM mode */
         ret = sport_set_multichannel(sport_handle, 8, 0xFF, 1);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
                 goto sport_config_err;
         }
 
-        ret = sport_config_rx(sport_handle, IRFS, 0x1F, 0, 0);
+        ret = sport_config_rx(sport_handle, 0, 0x1F, 0, 0);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
                 goto sport_config_err;
         }
 
-        ret = sport_config_tx(sport_handle, ITFS, 0x1F, 0, 0);
+        ret = sport_config_tx(sport_handle, 0, 0x1F, 0, 0);
         if (ret) {
                 pr_err("SPORT is busy!\n");
                 ret = -EBUSY;
                 goto sport_config_err;
         }
 
         ret = snd_soc_register_dai(&pdev->dev, &bf5xx_tdm_dai);
         if (ret) {
                 pr_err("Failed to register DAI: %d\n", ret);
                 goto sport_config_err;
@@ skipping 34 matching lines @@
 {
         platform_driver_unregister(&bfin_tdm_driver);
 }
 module_exit(bfin_tdm_exit);
 
 /* Module information */
 MODULE_AUTHOR("Barry Song");
 MODULE_DESCRIPTION("TDM driver for ADI Blackfin");
 MODULE_LICENSE("GPL");