From patchwork Mon Jul 22 18:27:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 11053263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 58FAE13AC for ; Mon, 22 Jul 2019 18:27:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B0F721FAD for ; Mon, 22 Jul 2019 18:27:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E55226E47; Mon, 22 Jul 2019 18:27:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.4 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E2DF321FAD for ; Mon, 22 Jul 2019 18:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:MIME-Version:Subject:From:References :In-Reply-To:Message-Id:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2ovLhWcl1wt6HxAK4KXkFY6O72keLzRdQY21dSBqoYk=; b=YQzeHduh7WoFW2 TPhLsn2sjcubwq2+tzZke+QEpid8HfeYjcRPaPJzKMqCzPjPX/L0ygLZFFmMKmLShvfuswdvgQM0C g9zxiGjPhQmdSUQPEq/aprwg0qKHMtZkPkPFK0MkVzipkjFoxkiXCLgs4m8XZ1elurHrFL0lZF5Ii /bLghYadnzwtatUjn2ZN+/pBMkICwdRXJw7Zv2fzFalXWs2m5oVuH5jrGHVoEUnMlMUPpxcFxSMmn Z7tsCMGidJjiIT2OnNk5dywmKHLQeSkVfr6v4rgT4HvoGmQyl9LUyKFzibzG5S+UmCwLU4jEsQX8Y yQCvFKy6pyGMThlNmfww==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hpd2I-0001WY-0D; Mon, 22 Jul 2019 18:27:46 +0000 Received: from rere.qmqm.pl ([91.227.64.183]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hpd22-0001PN-PO for linux-arm-kernel@lists.infradead.org; Mon, 22 Jul 2019 18:27:34 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 45sqmp49ylzLD; Mon, 22 Jul 2019 20:26:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1563819962; bh=7cyhUdMhixBBUfBCeVUJRa2O8CBgW7Y0NQpqrriXNt4=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=ES3s2M4D5ryWIG2cBgGsH3T5NSgkomJbBeUIzIkrzszGiQWvy2VxmuSCOg58TNR3c skzgaO7XKEsxZ6Cdi1T2uKzrCxUNPCYJqj8+QdzJsHMb3Y/AW0Ljs6xE5OAU5dw+x5 J5Vr0KZXcineQeW5lRxFt5UYUyqj38gcbPqNTu6BsNsKPgUBW45obKwK9T6Fq0AHLU JaOtwreeGEHI8sX8Wmhi3ooVrCnr5cKpE159lYXh29RKraq5IKXdvCMQB7hqeO98nW GgvEzA1EBv7NZTHTsCIddhc99oSd+mNrDDf+e0MwqOcUeAbjwp3PtJdv8qSVSg4EuS Lcd14xs36rr3g== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.3 at mail Date: Mon, 22 Jul 2019 20:27:21 +0200 Message-Id: <718983d82091da8cf619010c026dca541af3f4d1.1563819483.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH 4/5] ASoC: atmel_ssc_dai: split TX/RX FS constants MIME-Version: 1.0 To: alsa-devel@alsa-project.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190722_112731_430825_8754E093 X-CRM114-Status: UNSURE ( 6.35 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Liam Girdwood , Takashi Iwai , Ludovic Desroches , Mark Brown , Codrin Ciubotariu , Jaroslav Kysela , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The constants are the same, but the names are misleading when used for TCMR configuration. Use names from SAMA5D2 datasheet. Signed-off-by: Michał Mirosław Reviewed-by: Codrin Ciubotariu --- sound/soc/atmel/atmel_ssc_dai.c | 6 +++--- sound/soc/atmel/atmel_ssc_dai.h | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 04541d7c33fe..cf2cfc345676 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -572,7 +572,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, | SSC_BF(RCMR_START, SSC_START_RISING_RF); tcmr = SSC_BF(TCMR_STTDLY, 0) - | SSC_BF(TCMR_START, SSC_START_RISING_RF); + | SSC_BF(TCMR_START, SSC_START_RISING_TF); break; @@ -584,7 +584,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, | SSC_BF(RCMR_START, SSC_START_FALLING_RF); tcmr = SSC_BF(TCMR_STTDLY, 1) - | SSC_BF(TCMR_START, SSC_START_FALLING_RF); + | SSC_BF(TCMR_START, SSC_START_FALLING_TF); break; @@ -603,7 +603,7 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, | SSC_BF(RCMR_START, SSC_START_RISING_RF); tcmr = SSC_BF(TCMR_STTDLY, 1) - | SSC_BF(TCMR_START, SSC_START_RISING_RF); + | SSC_BF(TCMR_START, SSC_START_RISING_TF); break; diff --git a/sound/soc/atmel/atmel_ssc_dai.h b/sound/soc/atmel/atmel_ssc_dai.h index ae764cb541c7..efb458b6d187 100644 --- a/sound/soc/atmel/atmel_ssc_dai.h +++ b/sound/soc/atmel/atmel_ssc_dai.h @@ -42,13 +42,20 @@ */ /* START bit field values */ #define SSC_START_CONTINUOUS 0 -#define SSC_START_TX_RX 1 +#define SSC_START_TRANSMIT 1 +#define SSC_START_RECEIVE 1 #define SSC_START_LOW_RF 2 +#define SSC_START_LOW_TF 2 #define SSC_START_HIGH_RF 3 +#define SSC_START_HIGH_TF 3 #define SSC_START_FALLING_RF 4 +#define SSC_START_FALLING_TF 4 #define SSC_START_RISING_RF 5 +#define SSC_START_RISING_TF 5 #define SSC_START_LEVEL_RF 6 +#define SSC_START_LEVEL_TF 6 #define SSC_START_EDGE_RF 7 +#define SSC_START_EDGE_TF 7 #define SSS_START_COMPARE_0 8 /* CKI bit field values */