From patchwork Mon May 15 08:03:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 104371 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1431197qge; Mon, 15 May 2017 01:06:31 -0700 (PDT) X-Received: by 10.223.164.208 with SMTP id h16mr2887370wrb.142.1494835591848; Mon, 15 May 2017 01:06:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494835591; cv=none; d=google.com; s=arc-20160816; b=KVJSq/fhc0bJrs0bEQLBZgUj6LH01cc4SXkKE9XvsnrgAVnZsLrl4HbW66B94IiEd5 AoeJdJ06K2MqERgrwgkcmvSYkT7QcfhP6g0dOoeaUobMjH26LZvzMeumiNfW2pm1AnZQ l+gWUB08J2IfIgZSjma3CfJf6chLF90sE4ec/r+E5mxO9zhkzyUWnkiZTK9+IzjMrWzD h6T0qO+YJVPCHZpiWxrv3MAmWjZgInYnmOZbyglwaq5m6yudzZKETv7/u0O9GOpgjK70 8rjtiMYRu7y9iut/n1gvJOTu1Y6CiadxRkod7dPjOsoQn6qvi9hNbzQ19+/ihT3uwOCT mB7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :delivered-to:arc-authentication-results; bh=0iyr9NJ8/v7XhfLKhDGqCK5qqfoyg7ktkw9VTuwTTgo=; b=prrKqeOnbLBe0saA3tRNGh9Bf4uP3eb/T5QeTbG76lpQ7ZiZW+WQJ8b6GPhKc+QzHu 5ZQ2ua1t9YMofFuoe/x3oG2QMfAHny4FFrVDbC1HSF0yY2o1JrJ3F8wcZ45zvkw5Usx4 CbT0mrc1KRchNe4K1K9ju19CXQfwmrewlLJFKsUp4kzDbZclohWJF0b+6hRPz3PeiUHJ fVLY6Zav5Iolfpz/rlJjDt3c+N9rpucfKtlEOtjw3NUeJMydFz5ViB1AwBjEBA8BNM2F FwWeADx3aG4LJSeBT3TbKe75ldnPXr/+pfHJ9LefMfrAfhRnqX9l7jMMf6TXk3MBO749 XG9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id 62si11020547wrr.193.2017.05.15.01.06.31; Mon, 15 May 2017 01:06:31 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9F6AC267462; Mon, 15 May 2017 10:05:44 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id D9BF126745F; Mon, 15 May 2017 10:05:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id F33B9267399 for ; Mon, 15 May 2017 10:04:02 +0200 (CEST) Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dAAz0-0001kX-3B; Mon, 15 May 2017 08:04:00 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dAAyw-0002YV-Bj; Mon, 15 May 2017 17:03:54 +0900 From: Mark Brown To: Peter Ujfalusi In-Reply-To: <20170511065822.7604-1-peter.ujfalusi@ti.com> Message-Id: Date: Mon, 15 May 2017 17:03:54 +0900 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5:7e7a:91ff:fede:4a45 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: alsa-devel@alsa-project.org, Mark Brown , Liam Girdwood , misael.lopez@ti.com Subject: [alsa-devel] Applied "ASoC: davinci-mcasp: Support for one channel (mono) audio" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: davinci-mcasp: Support for one channel (mono) audio has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From e4798d26548b264be6604b45e4281244e96c9a09 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 11 May 2017 09:58:22 +0300 Subject: [PATCH] ASoC: davinci-mcasp: Support for one channel (mono) audio Mono audio can be achieved by configuring McASP to transmit/receive only during one timeslot. McASP will still going to generate clocks for the other slot(s), but will only use the single slot to transmit/receive. Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown --- sound/soc/davinci/davinci-mcasp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 3c5a9804d3f5..56ec1d301ac2 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -629,7 +629,7 @@ static int davinci_mcasp_ch_constraint(struct davinci_mcasp *mcasp, int stream, if (mcasp->tdm_mask[stream]) slots = hweight32(mcasp->tdm_mask[stream]); - for (i = 2; i <= slots; i++) + for (i = 1; i <= slots; i++) list[count++] = i; for (i = 2; i <= serializers; i++) @@ -1297,7 +1297,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_CHANNELS, - 2, max_channels); + 0, max_channels); snd_pcm_hw_constraint_list(substream->runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, @@ -1459,13 +1459,13 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = { .suspend = davinci_mcasp_suspend, .resume = davinci_mcasp_resume, .playback = { - .channels_min = 2, + .channels_min = 1, .channels_max = 32 * 16, .rates = DAVINCI_MCASP_RATES, .formats = DAVINCI_MCASP_PCM_FMTS, }, .capture = { - .channels_min = 2, + .channels_min = 1, .channels_max = 32 * 16, .rates = DAVINCI_MCASP_RATES, .formats = DAVINCI_MCASP_PCM_FMTS, @@ -1971,12 +1971,12 @@ static int davinci_mcasp_probe(struct platform_device *pdev) */ mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list = devm_kzalloc(mcasp->dev, sizeof(unsigned int) * - (32 + mcasp->num_serializer - 2), + (32 + mcasp->num_serializer - 1), GFP_KERNEL); mcasp->chconstr[SNDRV_PCM_STREAM_CAPTURE].list = devm_kzalloc(mcasp->dev, sizeof(unsigned int) * - (32 + mcasp->num_serializer - 2), + (32 + mcasp->num_serializer - 1), GFP_KERNEL); if (!mcasp->chconstr[SNDRV_PCM_STREAM_PLAYBACK].list ||