Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp671541img; Fri, 22 Mar 2019 06:18:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJ92tnuhBQjEL0gJjfth+O4GErT4K4hn+f/7nBrAbwzgdJL+ktcVB1YFx03m9CAfQqapmE X-Received: by 2002:a62:342:: with SMTP id 63mr9183538pfd.80.1553260697052; Fri, 22 Mar 2019 06:18:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553260697; cv=none; d=google.com; s=arc-20160816; b=cD9aiL51YCFmLGkZ4Ne5yZFuFbnNaRVjL/K1MS/bigX6Gp4jjxZkEJt885c9jmxWxY SoxL4dYfe+QIv9JzV47Awy9J7ntHEpCZGzJB1Z0Z3/MkCvQsasWYqrlDOZ2/GjKTaeZ0 w50hCeOGGZAiSZ8vZDSZOiSnbw7smMaNvy1ckVmAXl6puV9KAHkN8PObGsXELqhp2JeE GVzz6hbJ/0dDbzUI+QCEwnR6zxEJ+C+4pVVB6CMYQTyUHEdfqsyNJgtV22Fl97APCSIn E6FSqdJwwBu2erLk7/Vm9MtNeoESYU7kKFantz4W0IvN/HUL1LA0Hhhp7m86FFg2Xal9 1HfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IAVZ51ZcsDqI/W/3XCO6TZaAbGKjWfgfmchVA/xAVGs=; b=dgaJswVlfjYVtNchHDyDkvs61dVtQPJOnUsq82vECsjmPzh0jYLebt7ZIrr6gmxwzg jLNWt6SfRBPL9nPdIEto7bq9HtRH8+JHijjzt00fq6fkoAUsk1+ia3uRwuSjSVIjlsQB Iz6OyVqA3Wo0jC5NqYRjMXSLuBIdtqHuQPJEHaIDmOvZ6PnW7Z8FSkhgjlWLn7am5hwE uHEidhNJhnMruXwszIJ05pZ1YHfILLJN1cHE8vwxjWUEm+yL2tjo3yxu06nJbWr5rVLj DMS/Y60Mv9iPAz4HzKX/ivYHUazh3GU3PQ+DQ0sTObRncRfjaA7+DsSAtw0jO2CLs6q/ QRag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XzPHKNy8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v31si7269562plg.2.2019.03.22.06.18.01; Fri, 22 Mar 2019 06:18:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=XzPHKNy8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729281AbfCVLZ1 (ORCPT + 99 others); Fri, 22 Mar 2019 07:25:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:52772 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728646AbfCVLZZ (ORCPT ); Fri, 22 Mar 2019 07:25:25 -0400 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 9DF98218A2; Fri, 22 Mar 2019 11:25:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253924; bh=Zlg2yA4wrKA+4rCgP3GtrJX7oQT7aSTY0+q+YwJOtdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XzPHKNy8RZXkEdIT2qijg9hIzNi7Ensd3CPH1nWoF80blAK5S1uOM3SXdqj75lexJ 4ov0TiVTnWzwdX1SreE1wwILFGYt8adv7V6ijCG2gs67yt85wp9IwI7YQAV4kwNpJ8 VJHQ9r4px2LgMcBXjVBNTfV+OK6+HiTyzeVshupY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Fabio Estevam , Mark Brown , Nicolin Chen Subject: [PATCH 3.18 096/134] ASoC: fsl_esai: fix register setting issue in RIGHT_J mode Date: Fri, 22 Mar 2019 12:15:09 +0100 Message-Id: <20190322111217.100204236@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: S.j. Wang commit cc29ea007347f39f4c5a4d27b0b555955a0277f9 upstream. The ESAI_xCR_xWA is xCR's bit, not the xCCR's bit, driver set it to wrong register, correct it. Fixes 43d24e76b698 ("ASoC: fsl_esai: Add ESAI CPU DAI driver") Cc: Signed-off-by: Shengjiu Wang Reviewed-by: Fabio Estevam Ackedy-by: Nicolin Chen Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/fsl/fsl_esai.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -394,7 +394,8 @@ static int fsl_esai_set_dai_fmt(struct s break; case SND_SOC_DAIFMT_RIGHT_J: /* Data on rising edge of bclk, frame high, right aligned */ - xccr |= ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP | ESAI_xCR_xWA; + xccr |= ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP; + xcr |= ESAI_xCR_xWA; break; case SND_SOC_DAIFMT_DSP_A: /* Data on rising edge of bclk, frame high, 1clk before data */ @@ -451,12 +452,12 @@ static int fsl_esai_set_dai_fmt(struct s return -EINVAL; } - mask = ESAI_xCR_xFSL | ESAI_xCR_xFSR; + mask = ESAI_xCR_xFSL | ESAI_xCR_xFSR | ESAI_xCR_xWA; regmap_update_bits(esai_priv->regmap, REG_ESAI_TCR, mask, xcr); regmap_update_bits(esai_priv->regmap, REG_ESAI_RCR, mask, xcr); mask = ESAI_xCCR_xCKP | ESAI_xCCR_xHCKP | ESAI_xCCR_xFSP | - ESAI_xCCR_xFSD | ESAI_xCCR_xCKD | ESAI_xCR_xWA; + ESAI_xCCR_xFSD | ESAI_xCCR_xCKD; regmap_update_bits(esai_priv->regmap, REG_ESAI_TCCR, mask, xccr); regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, mask, xccr);