From patchwork Mon Nov 5 11:58:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 150176 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2506696ljp; Mon, 5 Nov 2018 03:58:26 -0800 (PST) X-Google-Smtp-Source: AJdET5f+A6e7OrO4nD8KYu6Fd+/5y7QQo5GmMGj76bxXxrqhA8+HSskC30JR3tSXxWxlW3mulInt X-Received: by 2002:a1c:6a01:: with SMTP id f1-v6mr5798651wmc.85.1541419105939; Mon, 05 Nov 2018 03:58:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541419105; cv=none; d=google.com; s=arc-20160816; b=JzzfGPMBWFo5b8Z1AekC/BXizXiqm+H5o9RuF7NnOCr59m36GDcG4iNQT8okyeTVLf AXRxKHVDTP7I6B0MVC2XsSFDu7+rW2Yu4AG0dPtx+HmjiMUt8A3kNRWbVI1cQSl0QMDa 5+PcQh9MC2enDC6gSDs6ItEj3mUG7udo2ZhmKOv2hRpE545vaOxOiym0+ffFUw2OmO9U Qcsrfl6Y7M8pvIyyZ+1psw0M/snTKOCJiRcBez2xyBAjx3iwkOdOrV334QMhtzuf0HOt R5uL+kQ9c7XcDZqEyvIQ5yKIa3c5ZnqHIn32arWW5kG8gaAMzJtAp5r/Yo05jZuf58Cw ljtQ== 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 :dkim-signature:delivered-to; bh=vAyFfzOm/FoGmb5acX0zCVvv9GlrnrTsa7yZo1DuGyk=; b=ku4/+36ZXdyOSr+kKCkPk9JUTXIsULdueznauqJA8TpfOOCyD3twdAXtjbD1+DQx8q FwlgpeCHgxyomPHczvklOQDsmdkWQhbaOZHr0/6YlxBrPfL7ihUX7lc+cRMXHJR0iq0H hcHII+ed8bA6mHo/M7zsN+NylxKIWE/2SBrN6GMhGaTvLmGy9DaHTlXoQjEFV6m/k0o3 9CXJyPAWSDTbatRU8FNQJEGwaajZBUIVaMU4LiF2FWLAqfgCEDSc9Kxxs2mUyV+DTMrY oknOqMPsiJpYXBk69RHS7YbCuc8e1Hu4qvbpRQrKhsHkqSnMcwsxUEFMOPhqzzu4FQVP nDEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=tadmUgp+; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id b81-v6si5917298wme.118.2018.11.05.03.58.25; Mon, 05 Nov 2018 03:58:25 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=tadmUgp+; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0CA522679FA; Mon, 5 Nov 2018 12:58:23 +0100 (CET) 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 5E0B92679B1; Mon, 5 Nov 2018 12:58:18 +0100 (CET) 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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id D2A24267A64 for ; Mon, 5 Nov 2018 12:58:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=Knfq/15FmQz7JiaHpPCz0ddBBXzOxTQjNawO3z2vcsw=; b=tadmUgp+OWEu DeRV23Z9l7fL8LojojhNRTij1WL+iO54ppO6B2PAaKJ3on4QJMICSsFFWyLx0PBTGcWOHOAUMTrzp uqGrfxvRvY2dVKQAExruwOxIDgCTCdY7+sQFLBrT5O5/VFMyRB76+wD4WJkFszaa2Z8los6yMMU1g 0+JwA=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gJdWG-0008I3-OM; Mon, 05 Nov 2018 11:58:12 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 756121124D98; Mon, 5 Nov 2018 11:58:12 +0000 (GMT) From: Mark Brown To: Peter Ujfalusi In-Reply-To: <20181025134824.16527-1-peter.ujfalusi@ti.com> Message-Id: <20181105115812.756121124D98@debutante.sirena.org.uk> Date: Mon, 5 Nov 2018 11:58:12 +0000 (GMT) Cc: alsa-devel@alsa-project.org, broonie@kernel.org, lgirdwood@gmail.com, jarkko.nikula@bitmer.com, aaro.koskinen@iki.fi Subject: [alsa-devel] Applied "ASoC: omap-mcbsp: On OMAP1 and OMAP2420 only 16bit format is supported" 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: omap-mcbsp: On OMAP1 and OMAP2420 only 16bit format is supported has been applied to the asoc tree at https://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 61f18dc78a6b70c409134d0f4d873e9253565e05 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 25 Oct 2018 16:48:24 +0300 Subject: [PATCH] ASoC: omap-mcbsp: On OMAP1 and OMAP2420 only 16bit format is supported For samples sizes of 20/24/32 bit the DRR2/DXR2 registers must be used to receive or transmit the most significant part of the 32bit sample. We can not trick the system by using the DRR2/DXR2 register offset and use 32bit element size since these (and other McBSP) registers are 16bit ones. We would need support for port_window in cyclic mode from the sDMA driver, but it is not straight forward as we would need to have the sDMA frame to cover the 32bit (DRR2+DRR1/DXR2+DXR1), but the frames must cover the ALSA period to be able to receive periodic interrupts. Since the 32bit samples are not working (DMA timeout), just remove it in case we have McBSP with reg_size of 2. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Mark Brown --- sound/soc/omap/omap-mcbsp.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index d0ebb6b9bfac..caa24c463b3e 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -862,6 +862,11 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) if (ret) return ret; + if (mcbsp->pdata->reg_size == 2) { + omap_mcbsp_dai.playback.formats = SNDRV_PCM_FMTBIT_S16_LE; + omap_mcbsp_dai.capture.formats = SNDRV_PCM_FMTBIT_S16_LE; + } + ret = devm_snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, &omap_mcbsp_dai, 1);