Merge branch 'feature/support_aw88298_for_codec_dev' into 'master'

esp_codec_dev: Support aw88298 audio amplifier See merge request adf/esp-adf-internal!1277
thienandangthanh · Feb 23, 2024 · 33ba0c5 · 33ba0c5
2 parents 1b9d7ef + 96c1a72
commit 33ba0c5
Show file tree

Hide file tree

Showing 13 changed files with 523 additions and 15 deletions.
diff --git a/components/audio_hal/driver/es8311/es8311.c b/components/audio_hal/driver/es8311/es8311.c
@@ -262,13 +262,9 @@ static void es8311_mute(int mute)
     ESP_LOGI(TAG, "Enter into es8311_mute(), mute = %d\n", mute);
     regv = es8311_read_reg(ES8311_DAC_REG31) & 0x9f;
     if (mute) {
-        es8311_write_reg(ES8311_SYSTEM_REG12, 0x02);
         es8311_write_reg(ES8311_DAC_REG31, regv | 0x60);
-        es8311_write_reg(ES8311_DAC_REG32, 0x00);
-        es8311_write_reg(ES8311_DAC_REG37, 0x08);
     } else {
         es8311_write_reg(ES8311_DAC_REG31, regv);
-        es8311_write_reg(ES8311_SYSTEM_REG12, 0x00);
     }
 }
 
@@ -285,7 +281,6 @@ static void es8311_suspend(void)
     es8311_write_reg(ES8311_SYSTEM_REG14, 0x00);
     es8311_write_reg(ES8311_SYSTEM_REG0D, 0xFA);
     es8311_write_reg(ES8311_ADC_REG15, 0x00);
-    es8311_write_reg(ES8311_DAC_REG37, 0x08);
     es8311_write_reg(ES8311_GP_REG45, 0x01);
 }
 
@@ -668,7 +663,7 @@ esp_err_t es8311_start(es_module_t mode)
 
     ret |= es8311_write_reg(ES8311_SYSTEM_REG0D, 0x01);
     ret |= es8311_write_reg(ES8311_ADC_REG15, 0x40);
-    ret |= es8311_write_reg(ES8311_DAC_REG37, 0x48);
+    ret |= es8311_write_reg(ES8311_DAC_REG37, 0x08);
     ret |= es8311_write_reg(ES8311_GP_REG45, 0x00);
 
     /* set internal reference signal (ADCL + DACR) */

diff --git a/components/esp_codec_dev/CMakeLists.txt b/components/esp_codec_dev/CMakeLists.txt
@@ -51,6 +51,10 @@ if (CONFIG_CODEC_ES8374_SUPPORT)
   list(APPEND COMPONENT_SRCS device/es8374/es8374.c)
 endif()
 
+if (CONFIG_CODEC_AW88298_SUPPORT)
+  list(APPEND COMPONENT_SRCS device/aw88298/aw88298.c)
+endif()
+
 if (CONFIG_CODEC_ZL38063_SUPPORT)
   list(APPEND COMPONENT_SRCS device/zl38063/zl38063.c
     device/zl38063/api_lib/vprocTwolf_access.c

diff --git a/components/esp_codec_dev/Kconfig b/components/esp_codec_dev/Kconfig
@@ -30,6 +30,12 @@ menu "Audio Codec Device Configuration"
         help
             Enable this option to support codec ES8156.
 
+    config CODEC_AW88298_SUPPORT
+        bool "Support AW88298 Codec Chip"
+        default y
+        help
+            Enable this option to support codec AW88298.
+
     config CODEC_ES8374_SUPPORT
         bool "Support ES8374 Codec Chip"
         default y

diff --git a/components/esp_codec_dev/README.md b/components/esp_codec_dev/README.md
@@ -23,6 +23,7 @@ The currently supported codec devices are listed as below:
 |ES8374  |Y|Y|
 |ZL38063  |Y|Y|
 |TAS6805M  |Y|N|
+|AW88298 |Y|N|
 |ES7210 |N|Y|
 |ES7243 |N|Y|
 |ES7243E |N|Y|

diff --git a/components/esp_codec_dev/README_CN.md b/components/esp_codec_dev/README_CN.md
@@ -22,6 +22,7 @@
 |ES8374  |Y|Y|
 |ZL38063  |Y|Y|
 |TAS6805M  |Y|N|
+|AW88298 |Y|N|
 |ES7210 |N|Y|
 |ES7243 |N|Y|
 |ES7243E |N|Y|