CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wl1273.c

 /*
  * ALSA SoC WL1273 codec driver
  *
  * Author:      Matti Aaltonen, <matti.j.aaltonen@nokia.com>
  *
  * Copyright:   (C) 2010 Nokia Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * version 2 as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA
  *
  */
 
 #include <linux/mfd/wl1273-core.h>
 #include <linux/slab.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
-#include <sound/soc-dai.h>
-#include <sound/soc-dapm.h>
+#include <sound/soc.h>
 #include <sound/initval.h>
 
 #include "wl1273.h"
 
 enum wl1273_mode { WL1273_MODE_BT, WL1273_MODE_FM_RX, WL1273_MODE_FM_TX };
 
 /* codec private data */
 struct wl1273_priv {
         enum wl1273_mode mode;
         struct wl1273_core *core;
         unsigned int channels;
 };
 
 static int snd_wl1273_fm_set_i2s_mode(struct wl1273_core *core,
                                       int rate, int width)
 {
-        struct device *dev = &core->i2c_dev->dev;
+        struct device *dev = &core->client->dev;
         int r = 0;
         u16 mode;
 
         dev_dbg(dev, "rate: %d\n", rate);
         dev_dbg(dev, "width: %d\n", width);
 
         mutex_lock(&core->lock);
 
         mode = core->i2s_mode & ~WL1273_IS2_WIDTH & ~WL1273_IS2_RATE;
 
@@ skipping 60 matching lines @@
                 dev_err(dev, "Data width: %d not supported\n", width);
                 r = -EINVAL;
                 goto out;
         }
 
         dev_dbg(dev, "WL1273_I2S_DEF_MODE: 0x%04x\n",  WL1273_I2S_DEF_MODE);
         dev_dbg(dev, "core->i2s_mode: 0x%04x\n", core->i2s_mode);
         dev_dbg(dev, "mode: 0x%04x\n", mode);
 
         if (core->i2s_mode != mode) {
-                r = wl1273_fm_write_cmd(core, WL1273_I2S_MODE_CONFIG_SET, mode);
+                r = core->write(core, WL1273_I2S_MODE_CONFIG_SET, mode);
                 if (r)
                         goto out;
 
                 core->i2s_mode = mode;
-                r = wl1273_fm_write_cmd(core, WL1273_AUDIO_ENABLE,
-                                        WL1273_AUDIO_ENABLE_I2S);
+                r = core->write(core, WL1273_AUDIO_ENABLE,
+                                WL1273_AUDIO_ENABLE_I2S);
                 if (r)
                         goto out;
         }
 out:
         mutex_unlock(&core->lock);
 
         return r;
 }
 
 static int snd_wl1273_fm_set_channel_number(struct wl1273_core *core,
                                             int channel_number)
 {
-        struct i2c_client *client = core->i2c_dev;
-        struct device *dev = &client->dev;
+        struct device *dev = &core->client->dev;
         int r = 0;
 
         dev_dbg(dev, "%s\n", __func__);
 
         mutex_lock(&core->lock);
 
         if (core->channel_number == channel_number)
                 goto out;
 
         if (channel_number == 1 && core->mode == WL1273_MODE_RX)
-                r = wl1273_fm_write_cmd(core, WL1273_MOST_MODE_SET,
-                                        WL1273_RX_MONO);
+                r = core->write(core, WL1273_MOST_MODE_SET, WL1273_RX_MONO);
         else if (channel_number == 1 && core->mode == WL1273_MODE_TX)
-                r = wl1273_fm_write_cmd(core, WL1273_MONO_SET,
-                                        WL1273_TX_MONO);
+                r = core->write(core, WL1273_MONO_SET, WL1273_TX_MONO);
         else if (channel_number == 2 && core->mode == WL1273_MODE_RX)
-                r = wl1273_fm_write_cmd(core, WL1273_MOST_MODE_SET,
-                                        WL1273_RX_STEREO);
+                r = core->write(core, WL1273_MOST_MODE_SET, WL1273_RX_STEREO);
         else if (channel_number == 2 && core->mode == WL1273_MODE_TX)
-                r = wl1273_fm_write_cmd(core, WL1273_MONO_SET,
-                                        WL1273_TX_STEREO);
+                r = core->write(core, WL1273_MONO_SET, WL1273_TX_STEREO);
         else
                 r = -EINVAL;
 out:
         mutex_unlock(&core->lock);
 
         return r;
 }
 
 static int snd_wl1273_get_audio_route(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
@@ skipping 52 matching lines @@
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
         int val, r = 0;
 
         dev_dbg(codec->dev, "%s: enter.\n", __func__);
 
         val = ucontrol->value.integer.value[0];
         if (wl1273->core->audio_mode == val)
                 return 0;
 
-        r = wl1273_fm_set_audio(wl1273->core, val);
+        r = wl1273->core->set_audio(wl1273->core, val);
         if (r < 0)
                 return r;
 
         return 1;
 }
 
 static const char *wl1273_audio_strings[] = { "Digital", "Analog" };
 
 static const struct soc_enum wl1273_audio_enum =
         SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(wl1273_audio_strings),
@@ skipping 14 matching lines @@
 
 static int snd_wl1273_fm_volume_put(struct snd_kcontrol *kcontrol,
                                     struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
         int r;
 
         dev_dbg(codec->dev, "%s: enter.\n", __func__);
 
-        r = wl1273_fm_set_volume(wl1273->core,
-                                 ucontrol->value.integer.value[0]);
+        r = wl1273->core->set_volume(wl1273->core,
+                                     ucontrol->value.integer.value[0]);
         if (r)
                 return r;
 
         return 1;
 }
 
 static const struct snd_kcontrol_new wl1273_controls[] = {
         SOC_ENUM_EXT("Codec Mode", wl1273_enum,
                      snd_wl1273_get_audio_route, snd_wl1273_set_audio_route),
         SOC_ENUM_EXT("Audio Switch", wl1273_audio_enum,
@@ skipping 231 matching lines @@
 
 static void __exit wl1273_exit(void)
 {
         platform_driver_unregister(&wl1273_platform_driver);
 }
 module_exit(wl1273_exit);
 
 MODULE_AUTHOR("Matti Aaltonen <matti.j.aaltonen@nokia.com>");
 MODULE_DESCRIPTION("ASoC WL1273 codec driver");
 MODULE_LICENSE("GPL");