From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04C14C2D0DB for ; Fri, 24 Jan 2020 11:24:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C6B62214AF for ; Fri, 24 Jan 2020 11:24:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865055; bh=PsUIB5tB+C+Df+Kwo1yLhlbZhI8IM4nS7whCi62dcBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YhAX+dzrH5EDuOYiKlC4ZXFxAogZvSJGlEDFAEYrDHVLqWdGNTL3Ybwn6a+IuaeYu IEo964qo87PhLgUaC1N1C0pU0qIYIsCD+5FzccwC9cqNpE7qG4cc8pqStNOkQJMgXx qqnI3+TotlhHoeYDKT61Achj2W5A8ngbWH7t3nWs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403770AbgAXLYP (ORCPT ); Fri, 24 Jan 2020 06:24:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:37400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403755AbgAXLYM (ORCPT ); Fri, 24 Jan 2020 06:24:12 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B6411206D4; Fri, 24 Jan 2020 11:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865051; bh=PsUIB5tB+C+Df+Kwo1yLhlbZhI8IM4nS7whCi62dcBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oDFYOGPauHyecCUFycwcrJq6elAszRlbIQU8cguLXhzixOYUCHU1OOU0CN68pIwfr FCtzm1KB1RBEqTLDTpg2G22vFgig04r0mSxdLxWnXeA0rjY+s6BquMP64cThUzJ3yO maELDQblY44SSYt/cF128v76O4aDQklWpt0Ytg0Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Mark Brown , Sasha Levin Subject: [PATCH 4.19 439/639] ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs Date: Fri, 24 Jan 2020 10:30:09 +0100 Message-Id: <20200124093142.028458462@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Ujfalusi [ Upstream commit fd14f4436fd47d5418023c90e933e66d3645552e ] If multiple serializers are connected in the system and the number of channels will need to use more than one serializer the mask to enable the serializers were left to 0 if tdm_mask is provided Fixes: dd55ff8346a97 ("ASoC: davinci-mcasp: Add set_tdm_slots() support") Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/davinci/davinci-mcasp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 6a8c279a4b20b..14ab16e1369f8 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -874,14 +874,13 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream, active_slots = hweight32(mcasp->tdm_mask[stream]); active_serializers = (channels + active_slots - 1) / active_slots; - if (active_serializers == 1) { + if (active_serializers == 1) active_slots = channels; - for (i = 0; i < total_slots; i++) { - if ((1 << i) & mcasp->tdm_mask[stream]) { - mask |= (1 << i); - if (--active_slots <= 0) - break; - } + for (i = 0; i < total_slots; i++) { + if ((1 << i) & mcasp->tdm_mask[stream]) { + mask |= (1 << i); + if (--active_slots <= 0) + break; } } } else { -- 2.20.1