From patchwork Thu Sep 6 06:25:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gcembed X-Patchwork-Id: 1412101 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id BA76BDFFCF for ; Thu, 6 Sep 2012 06:31:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9VZd-0001Ky-B5; Thu, 06 Sep 2012 06:28:21 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9VZZ-0001Kk-NZ for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 06:28:18 +0000 Received: by wibhq4 with SMTP id hq4so4422790wib.0 for ; Wed, 05 Sep 2012 23:28:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=7w2dxx3rhXELFE4qXsZzvy7vFLXoBZ82jMWpTngjFnI=; b=NcoKSPlQptngWhZkD0U1bTXlnPv6NAv9FkMEcXP0u5BQWs7ITGNxUTP0N+LIOTs+hq 9R2JYwTv/zabtRQIoSEzPuY9PXbGb8Ujnr67NByTiImDWaJsuSvb/8xddFhkcN0sXTHJ dMt5SRROhlGURVs0SjVd8dUDRhVXUUNeLGePrr+gYzOY0HGxsYmLfrqfj3af7yM8DYxV n6NHLSItshIRdFhErVJMtwA9tS6ltzrILaumr+r33Q6ojIe1/4FI0enXH24/0dN1T+V+ hIi/tN6NVhrFga1k2Hv9TrkJB5JN4n4u4S6rLQfEdpwdkiUSDpHRztVqIDNfSKyJMju2 /7jg== Received: by 10.180.81.38 with SMTP id w6mr2512029wix.10.1346912893951; Wed, 05 Sep 2012 23:28:13 -0700 (PDT) Received: from t410.TRUMP (34.16-66-87.adsl-static.isp.belgacom.be. [87.66.16.34]) by mx.google.com with ESMTPS id o2sm3511901wiz.11.2012.09.05.23.28.12 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Sep 2012 23:28:13 -0700 (PDT) From: =?UTF-8?q?Ga=C3=ABtan=20Carlier?= To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Fabio Estevam , Sascha Hauer , Shawn Guo , Lars-Peter Clausen Subject: [PATCH 1/1] [ASoC] Fix v2: Revert 'ASoC: imx-ssi: Remove mono support'. Date: Thu, 6 Sep 2012 08:25:53 +0200 Message-Id: <1346912753-2030-1-git-send-email-gcembed@gmail.com> X-Mailer: git-send-email 1.7.7.4 MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (gcembed[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.171 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: alsa-devel@alsa-project.org, Javier Martin , linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Ga=C3=ABtan=20Carlier?= X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org When patch of Javier Martin is applied on linux-next-20120824 the patch failed because comment line is missing. Signed-off-by: Gaëtan Carlier Signed-off-by: Javier Martin --- sound/soc/fsl/imx-ssi.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 7074ae6..3c520c4 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -380,14 +380,13 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai) static struct snd_soc_dai_driver imx_ssi_dai = { .probe = imx_ssi_dai_probe, .playback = { - /* The SSI does not support monaural audio. */ - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .capture = { - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE,