From patchwork Tue Aug 19 04:14:52 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiubo Li
X-Patchwork-Id: 381215
Return-Path:
X-Original-To: incoming-dt@patchwork.ozlabs.org
Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
by ozlabs.org (Postfix) with ESMTP id EC26C14011B
for ;
Tue, 19 Aug 2014 14:19:30 +1000 (EST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1751492AbaHSETa (ORCPT
);
Tue, 19 Aug 2014 00:19:30 -0400
Received: from mail-by2lp0243.outbound.protection.outlook.com
([207.46.163.243]:55589
"EHLO na01-by2-obe.outbound.protection.outlook.com"
rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
id S1751190AbaHSETa (ORCPT );
Tue, 19 Aug 2014 00:19:30 -0400
Received: from BN3PR0301CA0024.namprd03.prod.outlook.com (25.160.180.162) by
BY2PR0301MB0613.namprd03.prod.outlook.com (25.160.125.23) with
Microsoft SMTP
Server (TLS) id 15.0.1005.10; Tue, 19 Aug 2014 04:19:28 +0000
Received: from BN1BFFO11FD048.protection.gbl (2a01:111:f400:7c10::1:189) by
BN3PR0301CA0024.outlook.office365.com (2a01:111:e400:4000::34)
with Microsoft
SMTP Server (TLS) id 15.0.1010.18 via Frontend Transport;
Tue, 19 Aug 2014 04:19:27 +0000
Received: from tx30smr01.am.freescale.net (192.88.168.50) by
BN1BFFO11FD048.mail.protection.outlook.com (10.58.145.3) with
Microsoft SMTP
Server (TLS) id 15.0.1010.11 via Frontend Transport; Tue, 19 Aug 2014
04:19:27 +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
s7J4JCVh027907; Mon, 18 Aug 2014 21:19:24 -0700
From: Xiubo Li
To: , ,
, ,
CC: , Xiubo Li
Subject: [PATCHv2 4/5] ASoC: fsl-sai: Convert to use regmap framework's
endianness method.
Date: Tue, 19 Aug 2014 12:14:52 +0800
Message-ID: <1408421693-9929-5-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)(85852003)(64706001)(62966002)(106466001)(80022001)(50466002)(107046002)(76176999)(47776003)(50226001)(2201001)(92726001)(83072002)(97736001)(85306004)(20776003)(105606002)(95666004)(48376002)(46102001)(44976005)(87286001)(229853001)(6806004)(68736004)(79102001)(104016003)(31966008)(50986999)(86362001)(77156001)(93916002)(36756003)(104166001)(99396002)(84676001)(81342001)(87936001)(26826002)(81542001)(83322001)(89996001)(77982001)(76482001)(4396001)(92566001)(74662001)(88136002)(19580405001)(74502001)(102836001)(19580395003)(21056001);
DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB0613;
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
Sender: devicetree-owner@vger.kernel.org
Precedence: bulk
List-ID:
X-Mailing-List: devicetree@vger.kernel.org
Signed-off-by: Xiubo Li
---
Documentation/devicetree/bindings/sound/fsl-sai.txt | 7 +++----
sound/soc/fsl/fsl_sai.c | 6 +-----
sound/soc/fsl/fsl_sai.h | 1 -
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index dc9f9c3..aed1f21 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -18,9 +18,8 @@ Required properties:
- pinctrl-names: Must contain a "default" entry.
- pinctrl-NNN: One property must exist for each entry in pinctrl-names.
See ../pinctrl/pinctrl-bindings.txt for details of the property values.
-- big-endian-regs: 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
- device registers.
+- 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.
@@ -53,6 +52,6 @@ sai2: sai@40031000 {
dma-names = "tx", "rx";
dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>,
<&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>;
- big-endian-regs;
+ big-endian;
big-endian-data;
};
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 60fe7c7..a6eb784 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -544,7 +544,7 @@ static bool fsl_sai_writeable_reg(struct device *dev, unsigned int reg)
}
}
-static struct regmap_config fsl_sai_regmap_config = {
+static const struct regmap_config fsl_sai_regmap_config = {
.reg_bits = 32,
.reg_stride = 4,
.val_bits = 32,
@@ -573,10 +573,6 @@ 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_regs = of_property_read_bool(np, "big-endian-regs");
- if (sai->big_endian_regs)
- fsl_sai_regmap_config.val_format_endian = REGMAP_ENDIAN_BIG;
-
sai->big_endian_data = of_property_read_bool(np, "big-endian-data");
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index b3d8864..2cded44 100644
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -132,7 +132,6 @@ struct fsl_sai {
struct clk *bus_clk;
struct clk *mclk_clk[FSL_SAI_MCLK_MAX];
- bool big_endian_regs;
bool big_endian_data;
bool is_dsp_mode;
bool sai_on_imx;