hal: add audio support for kona (ef2f6e18) · Commits · e / devices / FP5 / android_hardware_qcom_audio

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		ifneq ($(AUDIO_USE_STUB_HAL), true)
		ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 msmnile $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 msmnile kona $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)

		MY_LOCAL_PATH := $(call my-dir)

hal/Android.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ LOCAL_ARM_MODE := arm

		AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)

		ifneq ($(filter msm8974 msm8226 msm8084 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 msmnile $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		ifneq ($(filter msm8974 msm8226 msm8084 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 msmnile kona $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)
		# B-family platform uses msm8974 code base
		AUDIO_PLATFORM = msm8974
		MULTIPLE_HW_VARIANTS_ENABLED := true
		@@ -70,6 +70,9 @@ ifneq ($(filter msmnile,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED
		LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED
		endif
		ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_KONA
		endif
		ifneq ($(filter $(MSMSTEPPE) ,$(TARGET_BOARD_PLATFORM)),)
		LOCAL_CFLAGS := -DPLATFORM_MSMSTEPPE
		endif

hal/audio_extn/hfp.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,11 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
		#define HFP_RX_VOLUME "PRI AUXPCM LOOPBACK Volume"
		#elif defined PLATFORM_AUTO
		#define HFP_RX_VOLUME "Playback 36 Volume"
		#elif defined (PLATFORM_MSM8998) \|\| defined (PLATFORM_MSMFALCON) \|\| defined (PLATFORM_SDM845) \|\| defined (PLATFORM_SDM710) \|\| defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| defined (PLATFORM_MSMSTEPPE) \|\| defined (PLATFORM_QCS405)
		#elif defined (PLATFORM_MSM8998) \|\| defined (PLATFORM_MSMFALCON) \|\| \
		defined (PLATFORM_SDM845) \|\| defined (PLATFORM_SDM710) \|\| \
		defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| \
		defined (PLATFORM_KONA) \|\| defined (PLATFORM_MSMSTEPPE) \|\| \
		defined (PLATFORM_QCS405)
		#define HFP_RX_VOLUME "SLIMBUS_7 LOOPBACK Volume"
		#else
		#define HFP_RX_VOLUME "Internal HFP RX Volume"

hal/msm8974/hw_info.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -504,6 +504,22 @@ static void update_hardware_info_msmnile(struct hardware_info *hw_info, const c
		}
		}

		static void update_hardware_info_kona(
		struct hardware_info *hw_info,
		const char *snd_card_name)
		{
		if (!strncmp(snd_card_name, "kona-mtp-snd-card",
		sizeof("kona-mtp-snd-card"))) {
		strlcpy(hw_info->name, "kona", sizeof(hw_info->name));
		} else if (!strncmp(snd_card_name, "kona-qrd-snd-card",
		sizeof("kona-qrd-snd-card"))) {
		strlcpy(hw_info->name, "kona", sizeof(hw_info->name));
		hw_info->is_stereo_spkr = false;
		} else {
		ALOGW("%s: Not a kona device", __func__);
		}
		}

		static void update_hardware_info_sda845(struct hardware_info hw_info, const char snd_card_name)
		{
		if (!strncmp(snd_card_name, "sda845-tavil-i2s-snd-card", sizeof("sda845-tavil-i2s-snd-card"))) {
		@@ -728,6 +744,9 @@ void hw_info_init(const char snd_card_name)
		} else if (strstr(snd_card_name, "sda845")) {
		ALOGV("SDA845 - variant soundcard");
		update_hardware_info_sda845(hw_info, snd_card_name);
		} else if (strstr(snd_card_name, "kona")) {
		ALOGV("KONA - variant soundcard");
		update_hardware_info_kona(hw_info, snd_card_name);
		} else {
		ALOGE("%s: Unsupported target %s:",__func__, snd_card_name);
		free(hw_info);

hal/msm8974/platform.c

+22 −7

Original line number	Diff line number	Diff line
		@@ -84,7 +84,10 @@
		#endif

		#include <linux/msm_audio.h>
		#if defined (PLATFORM_MSM8998) \|\| (PLATFORM_SDM845) \|\| (PLATFORM_SDM710) \|\| defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| defined (PLATFORM_MSMSTEPPE) \|\| defined (PLATFORM_QCS405)
		#if defined (PLATFORM_MSM8998) \|\| (PLATFORM_SDM845) \|\| (PLATFORM_SDM710) \|\| \
		defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| \
		defined (PLATFORM_KONA) \|\| defined (PLATFORM_MSMSTEPPE) \|\| \
		defined (PLATFORM_QCS405)
		#include <sound/devdep_params.h>
		#endif

		@@ -1321,8 +1324,9 @@ static const char *get_operator_specific_device_mixer_path(snd_device_t snd_devi
		return ret;
		}

		static void update_codec_type_and_interface(struct platform_data * my_data, const char *snd_card_name) {

		static void update_codec_type_and_interface(struct platform_data * my_data,
		const char *snd_card_name)
		{
		if (!strncmp(snd_card_name, "sdm670-skuw-snd-card",
		sizeof("sdm670-skuw-snd-card")) \|\|
		!strncmp(snd_card_name, "sdm660-snd-card-skush",
		@@ -1338,7 +1342,11 @@ static void update_codec_type_and_interface(struct platform_data * my_data, cons
		!strncmp(snd_card_name, "sm6150-idp-snd-card",
		sizeof("sm6150-idp-snd-card")) \|\|
		!strncmp(snd_card_name, "qcs605-lc-snd-card",
		sizeof("qcs605-lc-snd-card"))) {
		sizeof("qcs605-lc-snd-card")) \|\|
		!strncmp(snd_card_name, "kona-mtp-snd-card",
		sizeof("kona-mtp-snd-card")) \|\|
		!strncmp(snd_card_name, "kona-qrd-snd-card",
		sizeof("kona-qrd-snd-card"))) {
		ALOGI("%s: snd_card_name: %s", __func__, snd_card_name);
		my_data->is_internal_codec = true;
		my_data->is_slimbus_interface = false;
		@@ -2616,6 +2624,9 @@ void platform_init(struct audio_device adev)
		else if (!strncmp(snd_card_name, "sm6150-qrd-snd-card",
		sizeof("sm6150-qrd-snd-card")))
		platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);
		else if (!strncmp(snd_card_name, "kona-qrd-snd-card",
		sizeof("kona-qrd-snd-card")))
		platform_info_init(PLATFORM_INFO_XML_PATH_QRD, my_data, PLATFORM);
		else if (!strncmp(snd_card_name, "qcs405-wsa-snd-card",
		sizeof("qcs405-wsa-snd-card")))
		platform_info_init(PLATFORM_INFO_XML_PATH_WSA, my_data, PLATFORM);
		@@ -2864,7 +2875,8 @@ acdb_init_fail:

		if (!my_data->is_slimbus_interface) {
		//TODO:: make generic interfaceface to check Slimbus/I2S/CDC_DMA
		if (!strncmp(snd_card_name, "sm6150", strlen("sm6150"))) {
		if (!strncmp(snd_card_name, "sm6150", strlen("sm6150")) \|\|
		!strncmp(snd_card_name, "kona", strlen("kona"))) {
		my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].bitwidth_mixer_ctl =
		strdup("WSA_CDC_DMA_RX_0 Format");
		my_data->current_backend_cfg[DEFAULT_CODEC_BACKEND].samplerate_mixer_ctl =
		@@ -9266,7 +9278,10 @@ int platform_get_supported_copp_sampling_rate(uint32_t stream_sr)
		return sample_rate;
		}

		#if defined (PLATFORM_MSM8998) \|\| (PLATFORM_SDM845) \|\| (PLATFORM_SDM710) \|\| defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| defined (PLATFORM_MSMSTEPPE) \|\| defined (PLATFORM_QCS405)
		#if defined (PLATFORM_MSM8998) \|\| (PLATFORM_SDM845) \|\| (PLATFORM_SDM710) \|\| \
		defined (PLATFORM_QCS605) \|\| defined (PLATFORM_MSMNILE) \|\| \
		defined (PLATFORM_KONA) \|\| defined (PLATFORM_MSMSTEPPE) \|\| \
		defined (PLATFORM_QCS405)

		int platform_get_mmap_data_fd(void platform, int fe_dev, int dir, int fd,
		uint32_t *size)