summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/ab8500.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/ab8500.h')
-rw-r--r--sound/soc/codecs/ab8500.h42
1 files changed, 26 insertions, 16 deletions
diff --git a/sound/soc/codecs/ab8500.h b/sound/soc/codecs/ab8500.h
index 5273b8b9156..415d73a87a5 100644
--- a/sound/soc/codecs/ab8500.h
+++ b/sound/soc/codecs/ab8500.h
@@ -155,8 +155,7 @@ extern struct snd_soc_codec_driver soc_codec_dev_ab8500;
/* REG_ADPATHENA */
#define REG_ADPATHENA_ENAD12 7
#define REG_ADPATHENA_ENAD34 5
-#define REG_ADPATHENA_ENAD57 3
-#define REG_ADPATHENA_ENAD68 2
+#define REG_ADPATHENA_ENAD5768 3
/* REG_DAPATHENA */
#define REG_DAPATHENA_ENDA1 7
@@ -170,9 +169,10 @@ extern struct snd_soc_codec_driver soc_codec_dev_ab8500;
#define REG_ANACONF1_HSLOWPOW 7
#define REG_ANACONF1_DACLOWPOW1 6
#define REG_ANACONF1_DACLOWPOW0 5
-#define REG_ANACONF1_EARLOWPOW 4
+#define REG_ANACONF1_EARDACLOWPOW 4
#define REG_ANACONF1_EARSELCM 2
#define REG_ANACONF1_HSHPEN 1
+#define REG_ANACONF1_EARDRVLOWPOW 0
/* REG_ANACONF2 */
#define REG_ANACONF2_ENMIC1 7
@@ -254,6 +254,10 @@ extern struct snd_soc_codec_driver soc_codec_dev_ab8500;
/* REG_PWMGENCONF3 */
/* REG_PWMGENCONF4 */
/* REG_PWMGENCONF5 */
+#define REG_PWMGENCONFX_PWMVIBXPOL 7
+#define REG_PWMGENCONFX_PWMVIBXDUTCYC 0
+#define REG_PWMGENCONFX_PWMVIBXDUTCYC_MAX 0x64
+
/* REG_ANAGAIN1 */
/* REG_ANAGAIN2 */
#define REG_ANAGAINX_ENSEMICX 7
@@ -316,14 +320,14 @@ extern struct snd_soc_codec_driver soc_codec_dev_ab8500;
/* REG_DIGIFCONF4 */
/* REG_ADSLOTSELX */
-#define REG_ADSLOTSEL_ODDX_3 7
-#define REG_ADSLOTSEL_ODDX_2 6
-#define REG_ADSLOTSEL_ODDX_1 5
-#define REG_ADSLOTSEL_ODDX_0 4
-#define REG_ADSLOTSEL_EVENX_3 3
-#define REG_ADSLOTSEL_EVENX_2 2
-#define REG_ADSLOTSEL_EVENX_1 1
-#define REG_ADSLOTSEL_EVENX_0 0
+#define REG_ADSLOTSELX_ODDX_3 7
+#define REG_ADSLOTSELX_ODDX_2 6
+#define REG_ADSLOTSELX_ODDX_1 5
+#define REG_ADSLOTSELX_ODDX_0 4
+#define REG_ADSLOTSELX_EVENX_3 3
+#define REG_ADSLOTSELX_EVENX_2 2
+#define REG_ADSLOTSELX_EVENX_1 1
+#define REG_ADSLOTSELX_EVENX_0 0
/* REG_ADSLOTHIZCTRL1 */
/* REG_ADSLOTHIZCTRL2 */
@@ -357,11 +361,7 @@ extern struct snd_soc_codec_driver soc_codec_dev_ab8500;
/* REG_DASLOTCONF8 */
#define REG_DASLOTCONF8_DAI7TOADO8 5
-#define REG_DASLOTCONFX_SLTODAX4 4
-#define REG_DASLOTCONFX_SLTODAX3 3
-#define REG_DASLOTCONFX_SLTODAX2 2
-#define REG_DASLOTCONFX_SLTODAX1 1
-#define REG_DASLOTCONFX_SLTODAX0 0
+#define REG_DASLOTCONFX_SLTODAX_MASK 0x1F
/* REG_CLASSDCONF1 */
#define REG_CLASSDCONF1_PARLHF 7
@@ -389,6 +389,7 @@ extern struct snd_soc_codec_driver soc_codec_dev_ab8500;
/* REG_DMICFILTCONF */
#define REG_DMICFILTCONF_ANCINSEL 7
+#define REG_DMICFILTCONF_DA3TOEAR 6
#define REG_DMICFILTCONF_DMIC1SINC3 5
#define REG_DMICFILTCONF_DMIC2SINC3 4
#define REG_DMICFILTCONF_DMIC3SINC3 3
@@ -452,6 +453,11 @@ extern struct snd_soc_codec_driver soc_codec_dev_ab8500;
#define REG_SIDFIRGAINX_FIRSIDXGAIN_MAX 0x1F
/* REG_ANCCONF1 */
+#define REG_ANCCONF1_ANCIIRUPDATE 3
+#define REG_ANCCONF1_ENANC 2
+#define REG_ANCCONF1_ANCIIRINIT 1
+#define REG_ANCCONF1_ANCFIRUPDATE 0
+
/* REG_ANCCONF2 */
/* REG_ANCCONF3 */
/* REG_ANCCONF4 */
@@ -469,6 +475,10 @@ extern struct snd_soc_codec_driver soc_codec_dev_ab8500;
/* REG_SIDFIRCOEF1 */
/* REG_SIDFIRCOEF2 */
/* REG_SIDFIRCONF */
+#define REG_SIDFIRCONF_ENFIRSIDS 2
+#define REG_SIDFIRCONF_FIRSIDSTOIF1 1
+#define REG_SIDFIRCONF_FIRSIDBUSY 0
+
/* REG_AUDINTMASK1 */
/* REG_AUDINTSOURCE1 */
/* REG_AUDINTMASK2 */