From patchwork Tue Aug 19 04:14:53 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiubo Li
X-Patchwork-Id: 4740531
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 7170CC0338
for ;
Tue, 19 Aug 2014 04:25:52 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id 8CE022013A
for ;
Tue, 19 Aug 2014 04:25:51 +0000 (UTC)
Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243])
by mail.kernel.org (Postfix) with ESMTP id 532B22011D
for ;
Tue, 19 Aug 2014 04:25:50 +0000 (UTC)
Received: by alsa0.perex.cz (Postfix, from userid 1000)
id 668E42657DF; Tue, 19 Aug 2014 06:25:49 +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 14A1D2655E0;
Tue, 19 Aug 2014 06:22:22 +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 7078A265622; Tue, 19 Aug 2014 06:22:19 +0200 (CEST)
Received: from na01-by2-obe.outbound.protection.outlook.com
(mail-by2lp0237.outbound.protection.outlook.com [207.46.163.237])
by alsa0.perex.cz (Postfix) with ESMTP id 0CBC22655F0
for ;
Tue, 19 Aug 2014 06:19:34 +0200 (CEST)
Received: from BN3PR0301CA0050.namprd03.prod.outlook.com (25.160.152.146) by
BY2PR0301MB0614.namprd03.prod.outlook.com (25.160.125.24) with
Microsoft SMTP
Server (TLS) id 15.0.1010.18; Tue, 19 Aug 2014 04:19:30 +0000
Received: from BY2FFO11FD049.protection.gbl (2a01:111:f400:7c0c::191) by
BN3PR0301CA0050.outlook.office365.com (2a01:111:e400:401e::18) with
Microsoft SMTP Server (TLS) id 15.0.1010.18 via Frontend Transport;
Tue, 19 Aug 2014 04:19:30 +0000
Received: from tx30smr01.am.freescale.net (192.88.168.50) by
BY2FFO11FD049.mail.protection.outlook.com (10.1.15.186) with
Microsoft SMTP
Server (TLS) id 15.0.1010.11 via Frontend Transport; Tue, 19 Aug 2014
04:19:29 +0000
Received: from titan.ap.freescale.net ([10.192.208.233])
by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id
s7J4JCVi027907; Mon, 18 Aug 2014 21:19:26 -0700
From: Xiubo Li
To: , ,
, ,
Date: Tue, 19 Aug 2014 12:14:53 +0800
Message-ID: <1408421693-9929-6-git-send-email-Li.Xiubo@freescale.com>
X-Mailer: git-send-email 1.8.5
In-Reply-To: <1408421693-9929-1-git-send-email-Li.Xiubo@freescale.com>
References: <1408421693-9929-1-git-send-email-Li.Xiubo@freescale.com>
X-EOPAttributedMessage: 0
X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI;
EFV:NLI; SFV:NSPM;
SFS:(10019006)(6009001)(199003)(189002)(79102001)(93916002)(64706001)(20776003)(89996001)(87936001)(48376002)(84676001)(105606002)(36756003)(102836001)(85306004)(77156001)(80022001)(21056001)(4396001)(106466001)(88136002)(19580405001)(229853001)(83322001)(44976005)(6806004)(86362001)(95666004)(104016003)(50466002)(19580395003)(92566001)(104166001)(2201001)(92726001)(85852003)(26826002)(68736004)(50986999)(97736001)(83072002)(99396002)(87286001)(81542001)(81342001)(76176999)(575784001)(50226001)(47776003)(76482001)(77982001)(74502001)(107046002)(74662001)(46102001)(31966008)(62966002);
DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB0614;
H:tx30smr01.am.freescale.net;
FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en;
MIME-Version: 1.0
X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:;
X-Forefront-PRVS: 0308EE423E
Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not
designate 192.88.168.50 as permitted sender)
receiver=protection.outlook.com;
client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net;
Authentication-Results: spf=fail (sender IP is 192.88.168.50)
smtp.mailfrom=Li.Xiubo@freescale.com;
X-OriginatorOrg: freescale.com
Cc: devicetree@vger.kernel.org, Xiubo Li
Subject: [alsa-devel] [PATCHv2 5/5] ASoC: fsl-sai: rename big_endian_data to
is_msb_first.
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
Signed-off-by: Xiubo Li
---
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 aed1f21..e25ef38 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 SAI device 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.
+- msb-first: Configures whether the LSB or the MSB is transmitted first for
+ the fifo data. If this property is absent, the LSB is transmitted first as
+ default, or the MSB 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;
+ msb-first;
};
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index a6eb784..4e48431 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_msb_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_msb_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_msb_first = of_property_read_bool(np, "msb-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..7c76e8d 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_msb_first;
bool is_dsp_mode;
bool sai_on_imx;
bool synchronous[2];