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=ham 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 C8C03C2D0DB for ; Tue, 28 Jan 2020 14:11:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A06372468D for ; Tue, 28 Jan 2020 14:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220692; bh=3aQyFgPEAY1vmqYeYtAfg2xVoLGXpJTEIWhM2Kq7G/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hQp6EiHoQZwj/II1CIdMsRrIulP+0ZfOxPeJiTD5R7seVyTZYRDwcG1nmEbFSdOXd 9CqgsZ4iwyYosVNvpr7TI8vC4ZfouKG032N0rxul7k1lJ1Z4nZpK3hAF06ZD61hT3U MjnOsxQbpZO0T8xiBcFt3/k/uBmVgzJEOFvhfp4I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727274AbgA1OLa (ORCPT ); Tue, 28 Jan 2020 09:11:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:60576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728230AbgA1OLZ (ORCPT ); Tue, 28 Jan 2020 09:11:25 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 55C0A24685; Tue, 28 Jan 2020 14:11:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220684; bh=3aQyFgPEAY1vmqYeYtAfg2xVoLGXpJTEIWhM2Kq7G/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IfjvL16MkiKNVbtA6QGuXMXVeNrb9dpCE9yujZ8NMVFuqEHBu3N+ghH23FDaBRM2f 6VPVPgJY4IRKsPiWcluA7CG7+dcZb9kXm3snXwMVmwkCkjR5aBXmJPCkOhR7es3hH/ zrApB6piZrXwW+K/i2qoLiXdOpcwUwMyJUYSevFA= 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.4 104/183] ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs Date: Tue, 28 Jan 2020 15:05:23 +0100 Message-Id: <20200128135840.370880508@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@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 2f7be6cee98e9..fc0a73227b023 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -875,14 +875,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