Merge "hal: Add support for multiple hardware variants for DB8094"

This commit is contained in:
Linux Build Service Account 2014-11-14 23:56:03 -08:00 committed by Gerrit - the friendly Code Review server
commit 284eff23e4
1 changed files with 18 additions and 0 deletions

View File

@ -119,6 +119,18 @@ static const snd_device_t taiko_DB_variant_devices[] = {
SND_DEVICE_IN_QUAD_MIC,
};
static const snd_device_t tomtom_DB_variant_devices[] = {
SND_DEVICE_OUT_SPEAKER,
SND_DEVICE_OUT_SPEAKER_EXTERNAL_1,
SND_DEVICE_OUT_SPEAKER_EXTERNAL_2,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1,
SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2,
SND_DEVICE_OUT_VOICE_SPEAKER,
SND_DEVICE_IN_VOICE_SPEAKER_MIC,
SND_DEVICE_IN_HANDSET_MIC,
SND_DEVICE_IN_HANDSET_MIC_EXTERNAL
};
static const snd_device_t taiko_apq8084_sbc_variant_devices[] = {
SND_DEVICE_IN_HANDSET_MIC,
SND_DEVICE_IN_SPEAKER_MIC,
@ -226,6 +238,12 @@ static void update_hardware_info_8994(struct hardware_info *hw_info, const char
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, "msm8994-tomtom-db-snd-card")) {
strlcpy(hw_info->type, " dragon-board", sizeof(hw_info->type));
strlcpy(hw_info->name, "msm8994", sizeof(hw_info->name));
hw_info->snd_devices = (snd_device_t *)tomtom_DB_variant_devices;
hw_info->num_snd_devices = ARRAY_SIZE(tomtom_DB_variant_devices);
strlcpy(hw_info->dev_extn, "-db", sizeof(hw_info->dev_extn));
} else {
ALOGW("%s: Not an 8994 device", __func__);
}