CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/ak4642.c

 /*
  * ak4642.c  --  AK4642/AK4643 ALSA Soc Audio driver
  *
  * Copyright (C) 2009 Renesas Solutions Corp.
  * Kuninori Morimoto <morimoto.kuninori@renesas.com>
  *
  * Based on wm8731.c by Richard Purdie
  * Based on ak4535.c by Richard Purdie
  * Based on wm8753.c by Liam Girdwood
  *
  * 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.
  */
 
 /* ** CAUTION **
  *
  * This is very simple driver.
  * It can use headphone output / stereo input only
  *
  * AK4642 is not tested.
  * AK4643 is tested.
  */
 
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <sound/soc-dapm.h>
+#include <sound/soc.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 
 #define AK4642_VERSION "0.0.1"
 
 #define PW_MGMT1        0x00
 #define PW_MGMT2        0x01
 #define SG_SL1          0x02
 #define SG_SL2          0x03
 #define MD_CTL1         0x04
@@ skipping 69 matching lines @@
 /* MD_CTL1 */
 #define PLL3            (1 << 7)
 #define PLL2            (1 << 6)
 #define PLL1            (1 << 5)
 #define PLL0            (1 << 4)
 #define PLL_MASK        (PLL3 | PLL2 | PLL1 | PLL0)
 
 #define BCKO_MASK       (1 << 3)
 #define BCKO_64         BCKO_MASK
 
+#define DIF_MASK        (3 << 0)
+#define DSP             (0 << 0)
+#define RIGHT_J         (1 << 0)
+#define LEFT_J          (2 << 0)
+#define I2S             (3 << 0)
+
 /* MD_CTL2 */
 #define FS0             (1 << 0)
 #define FS1             (1 << 1)
 #define FS2             (1 << 2)
 #define FS3             (1 << 5)
 #define FS_MASK         (FS0 | FS1 | FS2 | FS3)
 
 /* MD_CTL3 */
 #define BST1            (1 << 3)
 
@@ skipping 218 matching lines @@
                 bcko = BCKO_64;
                 break;
         case SND_SOC_DAIFMT_CBS_CFS:
                 break;
         default:
                 return -EINVAL;
         }
         snd_soc_update_bits(codec, PW_MGMT2, MS, data);
         snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko);
 
+        /* format type */
+        data = 0;
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_LEFT_J:
+                data = LEFT_J;
+                break;
+        case SND_SOC_DAIFMT_I2S:
+                data = I2S;
+                break;
+        /* FIXME
+         * Please add RIGHT_J / DSP support here
+         */
+        default:
+                return -EINVAL;
+                break;
+        }
+        snd_soc_update_bits(codec, MD_CTL1, DIF_MASK, data);
+
         return 0;
 }
 
 static int ak4642_dai_hw_params(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params,
                                 struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
         u8 rate;
 
@@ skipping 164 matching lines @@
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&ak4642_i2c_driver);
 #endif
 
 }
 module_exit(ak4642_exit);
 
 MODULE_DESCRIPTION("Soc AK4642 driver");
 MODULE_AUTHOR("Kuninori Morimoto <morimoto.kuninori@renesas.com>");
 MODULE_LICENSE("GPL");