Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33193675 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Add sample rates to PCM front-end"

parents 20185f74 baff7765

sound/soc/msm/msm-dai-fe.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -25,7 +25,7 @@ static struct snd_soc_dai_ops msm_fe_dai_ops = {}; 
/* Conventional and unconventional sample rate supported */

static unsigned int supported_sample_rates[] = {

	8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000,

	96000, 192000

	88200, 96000, 176400, 192000

};



static struct snd_pcm_hw_constraint_list constraints_sample_rates = {

sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -99,7 +99,7 @@ static struct snd_pcm_hardware msm_pcm_hardware_playback = { 
/* Conventional and unconventional sample rate supported */

static unsigned int supported_sample_rates[] = {

	8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000,

	96000, 192000

	88200, 96000, 176400, 192000

};



static uint32_t in_frame_info[CAPTURE_MAX_NUM_PERIODS][2];