From patchwork Fri Aug 29 07:12:12 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiubo Li
X-Patchwork-Id: 4813001
Return-Path:
X-Original-To: patchwork-alsa-devel@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.19.201])
by patchwork2.web.kernel.org (Postfix) with ESMTP id 17410C0338
for ;
Fri, 29 Aug 2014 23:57:22 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id 31A0420127
for ;
Fri, 29 Aug 2014 23:57:21 +0000 (UTC)
Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243])
by mail.kernel.org (Postfix) with ESMTP id EBC942010E
for ;
Fri, 29 Aug 2014 23:57:19 +0000 (UTC)
Received: by alsa0.perex.cz (Postfix, from userid 1000)
id 0AF07265DE3; Sat, 30 Aug 2014 01:57:19 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Spam-Level:
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY
autolearn=unavailable version=3.3.1
Received: from alsa0.perex.cz (localhost [IPv6:::1])
by alsa0.perex.cz (Postfix) with ESMTP id 509D72655AA;
Fri, 29 Aug 2014 22:00:34 +0200 (CEST)
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 C37012655A6; Fri, 29 Aug 2014 22:00:32 +0200 (CEST)
Received: from na01-bl2-obe.outbound.protection.outlook.com
(mail-bl2lp0204.outbound.protection.outlook.com [207.46.163.204])
by alsa0.perex.cz (Postfix) with ESMTP id A1BD5266825
for ;
Fri, 29 Aug 2014 09:16:54 +0200 (CEST)
Received: from CH1PR03CA007.namprd03.prod.outlook.com (10.255.156.152) by
BY2PR0301MB0616.namprd03.prod.outlook.com (25.160.125.26) with
Microsoft SMTP
Server (TLS) id 15.0.1015.17; Fri, 29 Aug 2014 07:16:36 +0000
Received: from BL2FFO11FD049.protection.gbl (10.255.156.132) by
CH1PR03CA007.outlook.office365.com (10.255.156.152) with Microsoft
SMTP
Server (TLS) id 15.0.1015.19 via Frontend Transport; Fri, 29 Aug 2014
07:16:36 +0000
Received: from az84smr01.freescale.net (192.88.158.2) by
BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) with
Microsoft SMTP Server (TLS) id 15.0.1010.11 via Frontend Transport;
Fri, 29 Aug 2014 07:16:36 +0000
Received: from titan.ap.freescale.net ([10.192.208.233])
by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id
s7T7GWtH013776; Fri, 29 Aug 2014 00:16:32 -0700
From: Xiubo Li
To: , ,
Date: Fri, 29 Aug 2014 15:12:12 +0800
Message-ID: <1409296332-39318-1-git-send-email-Li.Xiubo@freescale.com>
X-Mailer: git-send-email 1.8.5
X-EOPAttributedMessage: 0
X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI;
EFV:NLI; SFV:NSPM;
SFS:(6009001)(199003)(189002)(104166001)(47776003)(85852003)(26826002)(50226001)(76482001)(85306004)(575784001)(89996001)(81542001)(2201001)(77156001)(77982001)(93916002)(79102001)(74502001)(92566001)(50986999)(6806004)(21056001)(83322001)(48376002)(106466001)(84676001)(19580395003)(87286001)(81342001)(87936001)(86362001)(90102001)(69596002)(104016003)(44976005)(105606002)(230783001)(74662001)(95666004)(46102001)(68736004)(20776003)(80022001)(62966002)(102836001)(83072002)(31966008)(88136002)(50466002)(19580405001)(4396001)(36756003)(229853001)(97736001)(99396002)(81156004)(64706001)(107046002)(92726001);
DIR:OUT; SFP:; SCL:1; SRVR:BY2PR0301MB0616; H:az84smr01.freescale.net;
FPR:;
MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:;
MIME-Version: 1.0
X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:;
X-Forefront-PRVS: 0318501FAE
Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not
designate 192.88.158.2 as permitted sender)
receiver=protection.outlook.com;
client-ip=192.88.158.2; helo=az84smr01.freescale.net;
Authentication-Results: spf=fail (sender IP is 192.88.158.2)
smtp.mailfrom=Li.Xiubo@freescale.com;
X-OriginatorOrg: freescale.com
Cc: devicetree@vger.kernel.org, Xiubo Li ,
linux-kernel@vger.kernel.org
Subject: [alsa-devel] [PATCHv2] ASoC: fsl-sai: using 'lsb-first' property
instead of 'big-endian-data'.
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: ,
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
X-Virus-Scanned: ClamAV using ClamSMTP
The 'big-endian-data' property is originally used to indicate whether the
LSB firstly or MSB firstly will be transmitted to the CODEC or received
from the CODEC, and there has nothing relation to the memory data.
Generally, if the audio data in big endian format, which will be using the
bytes reversion, Here this can only be used to bits reversion.
So using the 'lsb-first' instead of 'big-endian-data' can make the code
to be readable easier and more easy to understand what this property is
used to do.
This property used for configuring whether the LSB or the MSB is transmitted
first for the fifo data.
Signed-off-by: Xiubo Li
Cc: Nicolin Chen
---
Documentation/devicetree/bindings/sound/fsl-sai.txt | 8 ++++----
sound/soc/fsl/fsl_sai.c | 6 +++---
sound/soc/fsl/fsl_sai.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 06a405e..4956b14 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -20,9 +20,9 @@ Required properties:
See ../pinctrl/pinctrl-bindings.txt for details of the property values.
- big-endian: Boolean property, required if all the FTM_PWM registers
are big-endian rather than little-endian.
-- big-endian-data: If this property is absent, the little endian mode will
- be in use as default, or the big endian mode will be in use for all the
- fifo data.
+- lsb-first: Configures whether the LSB or the MSB is transmitted first for
+ the fifo data. If this property is absent, the MSB is transmitted first as
+ default, or the LSB is transmitted first.
- fsl,sai-synchronous-rx: This is a boolean property. If present, indicating
that SAI will work in the synchronous mode (sync Tx with Rx) which means
both the transimitter and receiver will send and receive data by following
@@ -53,5 +53,5 @@ sai2: sai@40031000 {
dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>,
<&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>;
big-endian;
- big-endian-data;
+ lsb-first;
};
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index a6eb784..7eeb1dd 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -175,7 +175,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,
bool tx = fsl_dir == FSL_FMT_TRANSMITTER;
u32 val_cr2 = 0, val_cr4 = 0;
- if (!sai->big_endian_data)
+ if (!sai->is_lsb_first)
val_cr4 |= FSL_SAI_CR4_MF;
/* DAI mode */
@@ -304,7 +304,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream,
val_cr5 |= FSL_SAI_CR5_WNW(word_width);
val_cr5 |= FSL_SAI_CR5_W0W(word_width);
- if (sai->big_endian_data)
+ if (sai->is_lsb_first)
val_cr5 |= FSL_SAI_CR5_FBT(0);
else
val_cr5 |= FSL_SAI_CR5_FBT(word_width - 1);
@@ -573,7 +573,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai"))
sai->sai_on_imx = true;
- sai->big_endian_data = of_property_read_bool(np, "big-endian-data");
+ sai->is_lsb_first = of_property_read_bool(np, "lsb-first");
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res);
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index 2cded44..3466720 100644
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -132,7 +132,7 @@ struct fsl_sai {
struct clk *bus_clk;
struct clk *mclk_clk[FSL_SAI_MCLK_MAX];
- bool big_endian_data;
+ bool is_lsb_first;
bool is_dsp_mode;
bool sai_on_imx;
bool synchronous[2];