From patchwork Tue Aug 19 04:12:43 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Xiubo Li
X-Patchwork-Id: 381213
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 05D3414010B
for ;
Tue, 19 Aug 2014 14:17:12 +1000 (EST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1751492AbaHSERL (ORCPT
);
Tue, 19 Aug 2014 00:17:11 -0400
Received: from mail-bn1blp0185.outbound.protection.outlook.com
([207.46.163.185]:44680
"EHLO na01-bn1-obe.outbound.protection.outlook.com"
rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
id S1750844AbaHSERK (ORCPT );
Tue, 19 Aug 2014 00:17:10 -0400
Received: from CH1PR03CA005.namprd03.prod.outlook.com (10.255.156.150) by
BN1PR0301MB0612.namprd03.prod.outlook.com (25.160.170.27) with
Microsoft SMTP
Server (TLS) id 15.0.1010.18; Tue, 19 Aug 2014 04:17:08 +0000
Received: from BL2FFO11FD010.protection.gbl (207.46.163.205) by
CH1PR03CA005.outlook.office365.com (10.255.156.150) with Microsoft
SMTP
Server (TLS) id 15.0.1010.18 via Frontend Transport; Tue, 19 Aug 2014
04:17:07 +0000
Received: from tx30smr01.am.freescale.net (192.88.168.50) by
BL2FFO11FD010.mail.protection.outlook.com (10.173.161.16) with
Microsoft SMTP
Server (TLS) id 15.0.1010.11 via Frontend Transport; Tue, 19 Aug 2014
04:17:07 +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
s7J4Grk6026768; Mon, 18 Aug 2014 21:17:05 -0700
From: Xiubo Li
To: , ,
, ,
CC: , Xiubo Li
Subject: [PATCH 4/5] ASoC: fsl-sai: Convert to use regmap framework's
endianness method.
Date: Tue, 19 Aug 2014 12:12:43 +0800
Message-ID: <1408421564-9863-5-git-send-email-Li.Xiubo@freescale.com>
X-Mailer: git-send-email 1.8.5
In-Reply-To: <1408421564-9863-1-git-send-email-Li.Xiubo@freescale.com>
References: <1408421564-9863-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)(189002)(199003)(50466002)(50226001)(106466001)(21056001)(48376002)(64706001)(4396001)(87936001)(19580395003)(88136002)(47776003)(89996001)(80022001)(99396002)(97736001)(68736004)(6806004)(76482001)(85852003)(20776003)(77156001)(44976005)(36756003)(76176999)(19580405001)(83322001)(50986999)(107046002)(26826002)(105606002)(83072002)(102836001)(104166001)(62966002)(87286001)(81342001)(229853001)(104016003)(95666004)(86362001)(93916002)(74662001)(85306004)(77982001)(92566001)(2201001)(79102001)(92726001)(31966008)(81542001)(74502001)(84676001)(46102001);
DIR:OUT; SFP:1102; SCL:1; SRVR:BN1PR0301MB0612;
H:tx30smr01.am.freescale.net;
FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; A: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;