From 364bbf53407fc17a9c5da4c382d70f2db94f6866 Mon Sep 17 00:00:00 2001
From: liangweih <liangweih@isoftstone.com>
Date: Wed, 22 Dec 2021 11:45:59 +0800
Subject: [PATCH 1/2] audio adapter rk3399

---
 model/audio/Kconfig  |  4 ++--
 model/audio/Makefile | 34 ++++++++++++++--------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/model/audio/Kconfig b/model/audio/Kconfig
index efb17c9..b195ba7 100755
--- a/model/audio/Kconfig
+++ b/model/audio/Kconfig
@@ -4,9 +4,9 @@ config DRIVERS_HDF_AUDIO
     depends on DRIVERS_HDF
     help
         Answer Y to choice HDF Audio driver.
-config DRIVERS_HDF_AUDIO_HI3516CODEC
+config DRIVERS_HDF_AUDIO_RK3399
     bool "Enable HDF Audio Codec driver"
-    default n
+    default y
     depends on DRIVERS_HDF_AUDIO
     help
         Answer Y to choice HDF Audio Codec driver.
diff --git a/model/audio/Makefile b/model/audio/Makefile
index d660376..cd884dc 100755
--- a/model/audio/Makefile
+++ b/model/audio/Makefile
@@ -16,8 +16,8 @@ KHDF_AUDIO_BASE_ROOT_DIR = ../../../../../..
 KHDF_AUDIO_KHDF_ROOT_DIR = drivers/hdf/khdf
 KHDF_FRAMEWORK_ROOT_DIR = drivers/hdf/framework
 KHDF_AUDIO_ROOT_DIR = ../../../../../framework/model/audio
-KHDF_AUDIO_HI3516DV300_DIR = $(KHDF_AUDIO_BASE_ROOT_DIR)/drivers/peripheral/audio/chipsets/hi3516dv300
-KHDF_AUDIO_HI3516DV300_INC_DIR = drivers/hdf/framework/../peripheral/audio/chipsets/hi3516dv300
+KHDF_AUDIO_RK3399_DIR = $(KHDF_AUDIO_BASE_ROOT_DIR)/drivers/peripheral/audio/chipsets/rk3399
+KHDF_AUDIO_RK3399_INC_DIR = drivers/hdf/framework/../peripheral/audio/chipsets/rk3399
 
 obj-$(CONFIG_DRIVERS_HDF_AUDIO) += \
           $(KHDF_AUDIO_ROOT_DIR)/core/src/audio_core.o \
@@ -33,19 +33,13 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO) += \
           $(KHDF_AUDIO_ROOT_DIR)/dispatch/src/audio_stream_dispatch.o \
           $(KHDF_AUDIO_ROOT_DIR)/dispatch/src/audio_control_dispatch.o
 
-obj-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/../tfa9879/accessory/src/tfa9879_accessory_adapter.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/../tfa9879/accessory/src/tfa9879_accessory_impl.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/codec/src/hi3516_codec_adapter.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/codec/src/hi3516_codec_impl.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/codec/src/hi3516_codec_ops.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/dsp/src/dsp_adapter.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/dsp/src/dsp_ops.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dai_adapter.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dai_ops.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_aiao_impl.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dma_ops.o \
-          $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dma_adapter.o
+obj-$(CONFIG_DRIVERS_HDF_AUDIO_RK3399) += \
+          $(KHDF_AUDIO_RK3399_DIR)/soc/src/rk3399_dma_ops.o \
+          $(KHDF_AUDIO_RK3399_DIR)/soc/src/rk3399_dma_adapter.o \
+          $(KHDF_AUDIO_RK3399_DIR)/dai/src/rk3399_dai_adapter.o \
+          $(KHDF_AUDIO_RK3399_DIR)/dai/src/rk3399_dai_ops.o \
+          $(KHDF_AUDIO_RK3399_DIR)/accessory/es8316/src/es8316_accessory_adapter.o \
+          $(KHDF_AUDIO_RK3399_DIR)/accessory/es8316/src/es8316_accessory_impl.o
 
 ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Werror \
              -I$(srctree)/$(KHDF_AUDIO_KHDF_ROOT_DIR)/osal/include \
@@ -63,8 +57,8 @@ ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Werror \
              -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/common/include \
              -I$(srctree)/bounds_checking_function/include
 
-ccflags-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \
-             -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/codec/include \
-             -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/soc/include \
-             -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/dsp/include \
-             -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/../tfa9879/accessory/include
+ccflags-$(CONFIG_DRIVERS_HDF_AUDIO_RK3399) +=  -lm -lc -lgcc -std=gnu99 -Werror \
+             -I$(srctree)/$(KHDF_AUDIO_RK3399_INC_DIR)/soc/include \
+             -I$(srctree)/$(KHDF_AUDIO_RK3399_INC_DIR)/dai/include \
+             -I$(srctree)/$(KHDF_AUDIO_RK3399_INC_DIR)/accessory/es8316/include
+
-- 
Gitee


From f3039dcc00ce5f42c172b5a515c9ad680257a323 Mon Sep 17 00:00:00 2001
From: liangweih <liangweih@isoftstone.com>
Date: Wed, 22 Dec 2021 12:08:56 +0800
Subject: [PATCH 2/2] audio adpater rk3399

---
 model/audio/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/audio/Kconfig b/model/audio/Kconfig
index b195ba7..843ae54 100755
--- a/model/audio/Kconfig
+++ b/model/audio/Kconfig
@@ -6,7 +6,7 @@ config DRIVERS_HDF_AUDIO
         Answer Y to choice HDF Audio driver.
 config DRIVERS_HDF_AUDIO_RK3399
     bool "Enable HDF Audio Codec driver"
-    default y
+    default n
     depends on DRIVERS_HDF_AUDIO
     help
         Answer Y to choice HDF Audio Codec driver.
-- 
Gitee