Merge "hal: Remove support for wcd9330" (41bcca8e) · Commits · e / os / android_hardware_qcom_audio

hal/msm8974/hw_info.c

+2 −23

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2013, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions are
		@@ -87,9 +87,6 @@ static const snd_device_t tomtom_msm8994_CDP_variant_devices[] = {
		SND_DEVICE_IN_HANDSET_MIC,
		};

		static const snd_device_t tomtom_8996_CDP_variant_devices[] = {
		};

		static const snd_device_t tomtom_liquid_variant_devices[] = {
		SND_DEVICE_OUT_SPEAKER,
		SND_DEVICE_OUT_SPEAKER_EXTERNAL_1,
		@@ -286,25 +283,7 @@ static void update_hardware_info_8994(struct hardware_info *hw_info, const char

		static void update_hardware_info_8996(struct hardware_info hw_info, const char snd_card_name)
		{
		if (!strcmp(snd_card_name, "msm8996-tomtom-mtp-snd-card")) {
		strlcpy(hw_info->type, " mtp", sizeof(hw_info->type));
		strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));
		hw_info->snd_devices = NULL;
		hw_info->num_snd_devices = 0;
		strlcpy(hw_info->dev_extn, "", sizeof(hw_info->dev_extn));
		} else if (!strcmp(snd_card_name, "msm8996-tomtom-cdp-snd-card")) {
		strlcpy(hw_info->type, " cdp", sizeof(hw_info->type));
		strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));
		hw_info->snd_devices = (snd_device_t *)tomtom_8996_CDP_variant_devices;
		hw_info->num_snd_devices = ARRAY_SIZE(tomtom_8996_CDP_variant_devices);
		strlcpy(hw_info->dev_extn, "-cdp", sizeof(hw_info->dev_extn));
		} else if (!strcmp(snd_card_name, "msm8996-tomtom-liquid-snd-card")) {
		strlcpy(hw_info->type, " liquid", sizeof(hw_info->type));
		strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));
		hw_info->snd_devices = (snd_device_t *)tomtom_liquid_variant_devices;
		hw_info->num_snd_devices = ARRAY_SIZE(tomtom_liquid_variant_devices);
		strlcpy(hw_info->dev_extn, "-liquid", sizeof(hw_info->dev_extn));
		} else if (!strcmp(snd_card_name, "msm8996-tasha-fluid-snd-card")) {
		if (!strcmp(snd_card_name, "msm8996-tasha-fluid-snd-card")) {
		strlcpy(hw_info->type, " fluid", sizeof(hw_info->type));
		strlcpy(hw_info->name, "msm8996", sizeof(hw_info->name));
		hw_info->snd_devices = (snd_device_t *)tasha_fluid_variant_devices;