CHROMIUM: ASoC: Import entire upstream ASoC tree

include/sound/wm8903.h

 /*
  * linux/sound/wm8903.h -- Platform data for WM8903
  *
  * Copyright 2010 Wolfson Microelectronics. PLC.
  *
  * 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.
  */
 
 #ifndef __LINUX_SND_WM8903_H
 #define __LINUX_SND_WM8903_H
 
 /* Used to enable configuration of a GPIO to all zeros */
 #define WM8903_GPIO_NO_CONFIG 0x8000
 
 /*
  * R6 (0x06) - Mic Bias Control 0
  */
-#define WM8903_MICDET_HYST_ENA                  0x0080  /* MICDET_HYST_ENA */
-#define WM8903_MICDET_HYST_ENA_MASK             0x0080  /* MICDET_HYST_ENA */
-#define WM8903_MICDET_HYST_ENA_SHIFT                 7  /* MICDET_HYST_ENA */
-#define WM8903_MICDET_HYST_ENA_WIDTH                 1  /* MICDET_HYST_ENA */
-#define WM8903_MICDET_THR_MASK                  0x0070  /* MICDET_THR - [6:4] */
-#define WM8903_MICDET_THR_SHIFT                      4  /* MICDET_THR - [6:4] */
-#define WM8903_MICDET_THR_WIDTH                      3  /* MICDET_THR - [6:4] */
+#define WM8903_MICDET_THR_MASK                  0x0030  /* MICDET_THR - [5:4] */
+#define WM8903_MICDET_THR_SHIFT                      4  /* MICDET_THR - [5:4] */
+#define WM8903_MICDET_THR_WIDTH                      2  /* MICDET_THR - [5:4] */
 #define WM8903_MICSHORT_THR_MASK                0x000C  /* MICSHORT_THR - [3:2] */
 #define WM8903_MICSHORT_THR_SHIFT                    2  /* MICSHORT_THR - [3:2] */
 #define WM8903_MICSHORT_THR_WIDTH                    2  /* MICSHORT_THR - [3:2] */
 #define WM8903_MICDET_ENA                       0x0002  /* MICDET_ENA */
 #define WM8903_MICDET_ENA_MASK                  0x0002  /* MICDET_ENA */
 #define WM8903_MICDET_ENA_SHIFT                      1  /* MICDET_ENA */
 #define WM8903_MICDET_ENA_WIDTH                      1  /* MICDET_ENA */
 #define WM8903_MICBIAS_ENA                      0x0001  /* MICBIAS_ENA */
 #define WM8903_MICBIAS_ENA_MASK                 0x0001  /* MICBIAS_ENA */
 #define WM8903_MICBIAS_ENA_SHIFT                     0  /* MICBIAS_ENA */
 #define WM8903_MICBIAS_ENA_WIDTH                     1  /* MICBIAS_ENA */
 
 /*
+ * WM8903_GPn_FN values
+ *
+ * See datasheets for list of valid values per pin
+ */
+#define WM8903_GPn_FN_GPIO_OUTPUT                    0
+#define WM8903_GPn_FN_BCLK                           1
+#define WM8903_GPn_FN_IRQ_OUTPT                      2
+#define WM8903_GPn_FN_GPIO_INPUT                     3
+#define WM8903_GPn_FN_MICBIAS_CURRENT_DETECT         4
+#define WM8903_GPn_FN_MICBIAS_SHORT_DETECT           5
+#define WM8903_GPn_FN_DMIC_LR_CLK_OUTPUT             6
+#define WM8903_GPn_FN_FLL_LOCK_OUTPUT                8
+#define WM8903_GPn_FN_FLL_CLOCK_OUTPUT               9
+
+/*
  * R116 (0x74) - GPIO Control 1
  */
 #define WM8903_GP1_FN_MASK                      0x1F00  /* GP1_FN - [12:8] */
 #define WM8903_GP1_FN_SHIFT                          8  /* GP1_FN - [12:8] */
 #define WM8903_GP1_FN_WIDTH                          5  /* GP1_FN - [12:8] */
 #define WM8903_GP1_DIR                          0x0080  /* GP1_DIR */
 #define WM8903_GP1_DIR_MASK                     0x0080  /* GP1_DIR */
 #define WM8903_GP1_DIR_SHIFT                         7  /* GP1_DIR */
 #define WM8903_GP1_DIR_WIDTH                         1  /* GP1_DIR */
 #define WM8903_GP1_OP_CFG                       0x0040  /* GP1_OP_CFG */
@@ skipping 174 matching lines @@
 #define WM8903_GP5_PU_WIDTH                          1  /* GP5_PU */
 #define WM8903_GP5_INTMODE                      0x0002  /* GP5_INTMODE */
 #define WM8903_GP5_INTMODE_MASK                 0x0002  /* GP5_INTMODE */
 #define WM8903_GP5_INTMODE_SHIFT                     1  /* GP5_INTMODE */
 #define WM8903_GP5_INTMODE_WIDTH                     1  /* GP5_INTMODE */
 #define WM8903_GP5_DB                           0x0001  /* GP5_DB */
 #define WM8903_GP5_DB_MASK                      0x0001  /* GP5_DB */
 #define WM8903_GP5_DB_SHIFT                          0  /* GP5_DB */
 #define WM8903_GP5_DB_WIDTH                          1  /* GP5_DB */
 
+#define WM8903_NUM_GPIO 5
+
 struct wm8903_platform_data {
         bool irq_active_low;   /* Set if IRQ active low, default high */
 
         /* Default register value for R6 (Mic bias), used to configure
          * microphone detection.  In conjunction with gpio_cfg this
          * can be used to route the microphone status signals out onto
          * the GPIOs for use with snd_soc_jack_add_gpios().
          */
         u16 micdet_cfg;
 
         int micdet_delay;      /* Delay after microphone detection (ms) */
 
-        u32 gpio_cfg[5];       /* Default register values for GPIO pin mux */
+        int gpio_base;
+        u32 gpio_cfg[WM8903_NUM_GPIO]; /* Default register values for GPIO pin mux */
 };
 
 #endif