From bc1be2647242c37f75cea30c3a6553dbca55f10c Mon Sep 17 00:00:00 2001 From: zhao_haipeng Date: Tue, 25 Jan 2022 15:56:57 +0800 Subject: [PATCH 1/3] audio kernel add rk3568 platform Signed-off-by: zhao_haipeng --- model/audio/Kconfig | 7 +++++++ model/audio/Makefile | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/model/audio/Kconfig b/model/audio/Kconfig index efb17c9..82cc568 100755 --- a/model/audio/Kconfig +++ b/model/audio/Kconfig @@ -11,6 +11,13 @@ config DRIVERS_HDF_AUDIO_HI3516CODEC help Answer Y to choice HDF Audio Codec driver. +config DRIVERS_HDF_AUDIO_RK3568 + bool "Enable HDF Audio Codec driver" + default n + depends on DRIVERS_HDF_AUDIO + help + Answer Y to choice HDF Audio Codec driver. + config DRIVERS_HDF_AUDIO_TEST bool "Enable HDF Audio driver Test" default n diff --git a/model/audio/Makefile b/model/audio/Makefile index d660376..b7b471f 100755 --- a/model/audio/Makefile +++ b/model/audio/Makefile @@ -11,13 +11,14 @@ # GNU General Public License for more details. # # - 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_RK3568_DIR = $(KHDF_AUDIO_BASE_ROOT_DIR)/device/hihope/rk3568/audio_drivers +KHDF_AUDIO_RK3568_INC_DIR = drivers/hdf/framework/../../device/hihope/rk3568/audio_drivers obj-$(CONFIG_DRIVERS_HDF_AUDIO) += \ $(KHDF_AUDIO_ROOT_DIR)/core/src/audio_core.o \ @@ -47,7 +48,19 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \ $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dma_ops.o \ $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_dma_adapter.o -ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Werror \ +obj-$(CONFIG_DRIVERS_HDF_AUDIO_RK3568) += \ + $(KHDF_AUDIO_RK3568_DIR)/codec/rk809_codec/src/rk809_codec_adapter.o \ + $(KHDF_AUDIO_RK3568_DIR)/codec/rk809_codec/src/rk809_codec_impl.o \ + $(KHDF_AUDIO_RK3568_DIR)/dsp/src/rk3568_dsp_adapter.o \ + $(KHDF_AUDIO_RK3568_DIR)/dsp/src/rk3568_dsp_ops.o \ + $(KHDF_AUDIO_RK3568_DIR)/dai/src/rk3568_dai_adapter.o \ + $(KHDF_AUDIO_RK3568_DIR)/dai/src/rk3568_dai_ops.o \ + $(KHDF_AUDIO_RK3568_DIR)/dai/src/rk3568_dai_linux_driver.o \ + $(KHDF_AUDIO_RK3568_DIR)/soc/src/rk3568_dma_adapter.o \ + $(KHDF_AUDIO_RK3568_DIR)/soc/src/rk3568_dma_ops.o + +ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Wno-declaration-after-statement \ + -Wno-incompatible-pointer-types \ -I$(srctree)/$(KHDF_AUDIO_KHDF_ROOT_DIR)/osal/include \ -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/core \ -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/utils \ @@ -68,3 +81,10 @@ ccflags-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \ -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_RK3568) += \ + -I$(srctree)/$(KHDF_AUDIO_RK3568_INC_DIR)/soc/include \ + -I$(srctree)/$(KHDF_AUDIO_RK3568_INC_DIR)/dai/include \ + -I$(srctree)/$(KHDF_AUDIO_RK3568_INC_DIR)/dsp/include \ + -I$(srctree)/$(KHDF_AUDIO_RK3568_INC_DIR)/codec/rk809_codec/include \ + -I$(srctree)/$(KHDF_AUDIO_RK3568_INC_DIR)/include -- Gitee From 3050daea5f6083625d88099012c59007928d1b45 Mon Sep 17 00:00:00 2001 From: zhao_haipeng Date: Sun, 30 Jan 2022 16:50:06 +0800 Subject: [PATCH 2/3] get codec platform device use linux drivers Signed-off-by: zhao_haipeng --- model/audio/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/model/audio/Makefile b/model/audio/Makefile index b7b471f..20e3601 100755 --- a/model/audio/Makefile +++ b/model/audio/Makefile @@ -51,6 +51,7 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO_HI3516CODEC) += \ obj-$(CONFIG_DRIVERS_HDF_AUDIO_RK3568) += \ $(KHDF_AUDIO_RK3568_DIR)/codec/rk809_codec/src/rk809_codec_adapter.o \ $(KHDF_AUDIO_RK3568_DIR)/codec/rk809_codec/src/rk809_codec_impl.o \ + $(KHDF_AUDIO_RK3568_DIR)/codec/rk809_codec/src/rk809_codec_linux_driver.o \ $(KHDF_AUDIO_RK3568_DIR)/dsp/src/rk3568_dsp_adapter.o \ $(KHDF_AUDIO_RK3568_DIR)/dsp/src/rk3568_dsp_ops.o \ $(KHDF_AUDIO_RK3568_DIR)/dai/src/rk3568_dai_adapter.o \ -- Gitee From 3cc058b9ec591e7863c0ecee2615588f938b8378 Mon Sep 17 00:00:00 2001 From: zhao_haipeng Date: Thu, 10 Feb 2022 11:34:05 +0800 Subject: [PATCH 3/3] modify compile options Signed-off-by: zhao_haipeng --- model/audio/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/model/audio/Makefile b/model/audio/Makefile index 20e3601..b67a270 100755 --- a/model/audio/Makefile +++ b/model/audio/Makefile @@ -60,8 +60,7 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO_RK3568) += \ $(KHDF_AUDIO_RK3568_DIR)/soc/src/rk3568_dma_adapter.o \ $(KHDF_AUDIO_RK3568_DIR)/soc/src/rk3568_dma_ops.o -ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Wno-declaration-after-statement \ - -Wno-incompatible-pointer-types \ +ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 \ -I$(srctree)/$(KHDF_AUDIO_KHDF_ROOT_DIR)/osal/include \ -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/core \ -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/utils \ -- Gitee