Merge "Add atoll target for audio hal." (e36ab78f) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

configs/atoll/atoll.mk

100644 → 100755

+0 −94

Original line number	Diff line number	Diff line
		@@ -71,87 +71,6 @@ AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

		BOARD_SUPPORTS_OPENSOURCE_STHAL := true

		AUDIO_HARDWARE := audio.a2dp.default
		AUDIO_HARDWARE += audio.usb.default
		AUDIO_HARDWARE += audio.r_submix.default
		AUDIO_HARDWARE += audio.primary.atoll

		#HAL Wrapper
		AUDIO_WRAPPER := libqahw
		AUDIO_WRAPPER += libqahwwrapper

		#HAL Test app
		AUDIO_HAL_TEST_APPS := hal_play_test
		AUDIO_HAL_TEST_APPS += hal_rec_test

		PRODUCT_PACKAGES += $(AUDIO_HARDWARE)
		PRODUCT_PACKAGES += $(AUDIO_WRAPPER)
		PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)

		ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)
		BOARD_VENDOR_KERNEL_MODULES := \
		$(KERNEL_MODULES_OUT)/audio_apr.ko \
		$(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \
		$(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \
		$(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \
		$(KERNEL_MODULES_OUT)/audio_q6.ko \
		$(KERNEL_MODULES_OUT)/audio_usf.ko \
		$(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \
		$(KERNEL_MODULES_OUT)/audio_swr.ko \
		$(KERNEL_MODULES_OUT)/audio_wcd_core.ko \
		$(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \
		$(KERNEL_MODULES_OUT)/audio_wsa881x.ko \
		$(KERNEL_MODULES_OUT)/audio_platform.ko \
		$(KERNEL_MODULES_OUT)/audio_hdmi.ko \
		$(KERNEL_MODULES_OUT)/audio_stub.ko \
		$(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \
		$(KERNEL_MODULES_OUT)/audio_mbhc.ko \
		$(KERNEL_MODULES_OUT)/audio_wcd938x.ko \
		$(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \
		$(KERNEL_MODULES_OUT)/audio_wcd937x.ko \
		$(KERNEL_MODULES_OUT)/audio_wcd937x_slave.ko \
		$(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \
		$(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \
		$(KERNEL_MODULES_OUT)/audio_va_macro.ko \
		$(KERNEL_MODULES_OUT)/audio_rx_macro.ko \
		$(KERNEL_MODULES_OUT)/audio_tx_macro.ko \
		$(KERNEL_MODULES_OUT)/audio_native.ko \
		$(KERNEL_MODULES_OUT)/audio_machine_atoll.ko \
		$(KERNEL_MODULES_OUT)/audio_snd_event.ko
		endif

		#Audio DLKM
		AUDIO_DLKM := audio_apr.ko
		AUDIO_DLKM += audio_q6_pdr.ko
		AUDIO_DLKM += audio_q6_notifier.ko
		AUDIO_DLKM += audio_adsp_loader.ko
		AUDIO_DLKM += audio_q6.ko
		AUDIO_DLKM += audio_usf.ko
		AUDIO_DLKM += audio_pinctrl_wcd.ko
		AUDIO_DLKM += audio_swr.ko
		AUDIO_DLKM += audio_wcd_core.ko
		AUDIO_DLKM += audio_swr_ctrl.ko
		AUDIO_DLKM += audio_wsa881x.ko
		AUDIO_DLKM += audio_platform.ko
		AUDIO_DLKM += audio_hdmi.ko
		AUDIO_DLKM += audio_stub.ko
		AUDIO_DLKM += audio_wcd9xxx.ko
		AUDIO_DLKM += audio_mbhc.ko
		AUDIO_DLKM += audio_native.ko
		AUDIO_DLKM += audio_wcd938x.ko
		AUDIO_DLKM += audio_wcd938x_slave.ko
		AUDIO_DLKM += audio_wcd937x.ko
		AUDIO_DLKM += audio_wcd937x_slave.ko
		AUDIO_DLKM += audio_bolero_cdc.ko
		AUDIO_DLKM += audio_wsa_macro.ko
		AUDIO_DLKM += audio_va_macro.ko
		AUDIO_DLKM += audio_rx_macro.ko
		AUDIO_DLKM += audio_tx_macro.ko
		AUDIO_DLKM += audio_machine_atoll.ko
		AUDIO_DLKM += audio_snd_event.ko

		PRODUCT_PACKAGES += $(AUDIO_DLKM)

		#Audio Specific device overlays
		DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay

		@@ -201,19 +120,6 @@ persist.vendor.audio.fluence.voicecall=true\
		persist.vendor.audio.fluence.voicerec=false\
		persist.vendor.audio.fluence.speaker=true

		#
		#snapdragon value add features
		#
		PRODUCT_PROPERTY_OVERRIDES += \
		ro.qc.sdk.audio.ssr=false

		##fluencetype can be "fluence" or "fluencepro" or "none"
		PRODUCT_PROPERTY_OVERRIDES += \
		ro.qc.sdk.audio.fluencetype=none\
		persist.audio.fluence.voicecall=true\
		persist.audio.fluence.voicerec=false\
		persist.audio.fluence.speaker=true

		##speaker protection v3 switch and ADSP AFE API version
		PRODUCT_PROPERTY_OVERRIDES += \
		persist.vendor.audio.spv3.enable=true\

hal/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,10 @@ ifneq ($(filter lito,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_LITO
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
		endif
		ifneq ($(filter atoll,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_ATOLL
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"
		endif
		ifneq ($(filter sdm660,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_MSMFALCON
		LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="8"

hal/audio_extn/Android.mk

+5 −5

Original line number	Diff line number	Diff line
		@@ -410,7 +410,7 @@ LOCAL_VENDOR_MODULE := true
		PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
		AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)

		ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		# B-family platform uses msm8974 code base
		AUDIO_PLATFORM := msm8974
		MULTIPLE_HW_VARIANTS_ENABLED := true
		@@ -469,7 +469,7 @@ LOCAL_VENDOR_MODULE := true
		PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
		AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)

		ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		# B-family platform uses msm8974 code base
		AUDIO_PLATFORM := msm8974
		MULTIPLE_HW_VARIANTS_ENABLED := true
		@@ -528,7 +528,7 @@ LOCAL_VENDOR_MODULE := true
		PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
		AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)

		ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		# B-family platform uses msm8974 code base
		AUDIO_PLATFORM := msm8974
		MULTIPLE_HW_VARIANTS_ENABLED := true
		@@ -590,7 +590,7 @@ LOCAL_VENDOR_MODULE := true
		PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
		AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)

		ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		# B-family platform uses msm8974 code base
		AUDIO_PLATFORM := msm8974
		MULTIPLE_HW_VARIANTS_ENABLED := true
		@@ -660,7 +660,7 @@ LOCAL_VENDOR_MODULE := true
		PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal
		AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)

		ifneq ($(filter sdm845 sdm710 msmnile kona lito sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter sdm845 sdm710 msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		# B-family platform uses msm8974 code base
		AUDIO_PLATFORM := msm8974
		MULTIPLE_HW_VARIANTS_ENABLED := true

hal/msm8974/platform.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -89,7 +89,9 @@
		defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| \
		defined (PLATFORM_KONA) \|\| defined (PLATFORM_MSMSTEPPE) \|\| \
		defined (PLATFORM_QCS405) \|\| defined (PLATFORM_TRINKET) \|\| \
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON)
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON) \|\| \
		defined (PLATFORM_ATOLL)

		#include <sound/devdep_params.h>
		#endif

		@@ -10617,7 +10619,8 @@ int platform_get_supported_copp_sampling_rate(uint32_t stream_sr)
		defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| \
		defined (PLATFORM_KONA) \|\| defined (PLATFORM_MSMSTEPPE) \|\| \
		defined (PLATFORM_QCS405) \|\| defined (PLATFORM_TRINKET) \|\| \
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON)
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON) \|\| \
		defined (PLATFORM_ATOLL)
		int platform_get_mmap_data_fd(void platform, int fe_dev, int dir, int fd,
		uint32_t *size)
		{

hal/msm8974/platform.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -480,7 +480,8 @@ enum {
		defined (PLATFORM_QCS605) \|\|defined (PLATFORM_SDX24) \|\| \
		defined (PLATFORM_MSMNILE) \|\| defined (PLATFORM_KONA) \|\| \
		defined (PLATFORM_MSMSTEPPE) \|\| defined (PLATFORM_QCS405) \|\| \
		defined (PLATFORM_TRINKET) \|\| defined (PLATFORM_LITO)
		defined (PLATFORM_TRINKET) \|\| defined (PLATFORM_LITO) \|\| \
		defined (PLATFORM_ATOLL)
		#define PLAYBACK_OFFLOAD_DEVICE2 17
		#elif defined (PLATFORM_MSMFALCON) \|\| defined (PLATFORM_MSM8937)
		#define PLAYBACK_OFFLOAD_DEVICE2 24
		@@ -493,7 +494,7 @@ enum {
		defined (PLATFORM_KONA) \|\| defined (PLATFORM_MSMSTEPPE) \|\| \
		defined (PLATFORM_QCS405) \|\| defined (PLATFORM_TRINKET) \|\| \
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON) \|\| \
		defined (PLATFORM_MSM8937)
		defined (PLATFORM_MSM8937) \|\| defined (PLATFORM_ATOLL)
		#define PLAYBACK_OFFLOAD_DEVICE3 18
		#define PLAYBACK_OFFLOAD_DEVICE4 34
		#define PLAYBACK_OFFLOAD_DEVICE5 35

Original line number	Diff line number	Diff line
		@@ -89,7 +89,9 @@
		defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| \
		defined (PLATFORM_KONA) \|\| defined (PLATFORM_MSMSTEPPE) \|\| \
		defined (PLATFORM_QCS405) \|\| defined (PLATFORM_TRINKET) \|\| \
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON)
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON) \|\| \
		defined (PLATFORM_ATOLL)

		#include <sound/devdep_params.h>
		#endif

		@@ -10617,7 +10619,8 @@ int platform_get_supported_copp_sampling_rate(uint32_t stream_sr)
		defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| \
		defined (PLATFORM_KONA) \|\| defined (PLATFORM_MSMSTEPPE) \|\| \
		defined (PLATFORM_QCS405) \|\| defined (PLATFORM_TRINKET) \|\| \
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON)
		defined (PLATFORM_LITO) \|\| defined (PLATFORM_MSMFALCON) \|\| \
		defined (PLATFORM_ATOLL)
		int platform_get_mmap_data_fd(void platform, int fe_dev, int dir, int fd,
		uint32_t *size)
		{