From: Xiubo Li <Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
To: broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
mark.rutland-5wv7dgnIgG8@public.gmane.org,
nicoleotsuka-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
timur-N01EOCouUvQ@public.gmane.org
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Xiubo Li <Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Subject: [PATCHv2 5/5] ASoC: fsl-sai: rename big_endian_data to is_msb_first.
Date: Tue, 19 Aug 2014 12:14:53 +0800 [thread overview]
Message-ID: <1408421693-9929-6-git-send-email-Li.Xiubo@freescale.com> (raw)
In-Reply-To: <1408421693-9929-1-git-send-email-Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
Signed-off-by: Xiubo Li <Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
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];
--
1.8.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-08-19 4:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-19 4:14 [PATCHv2 0/5] Convert to use regmap framework's endianness method Xiubo Li
[not found] ` <1408421693-9929-1-git-send-email-Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2014-08-19 4:14 ` [PATCHv2 1/5] ASoC: fsl-asrc: " Xiubo Li
[not found] ` <1408421693-9929-2-git-send-email-Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2014-08-25 1:23 ` Nicolin Chen
2014-08-25 1:44 ` Li.Xiubo-KZfg59tc24xl57MIdRCFDg
[not found] ` <ece08117aedf49eabd6660078432ed87-swgC6WJTr6EbUgZD/0KOGpwN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2014-08-25 2:13 ` Nicolin Chen
2014-08-25 2:29 ` Li.Xiubo-KZfg59tc24xl57MIdRCFDg
[not found] ` <12fb3eca298842929a782e80a9cf6fbc-swgC6WJTr6EbUgZD/0KOGpwN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2014-08-25 2:48 ` Nicolin Chen
2014-08-19 4:14 ` [PATCHv2 2/5] ASoC: fsl-esai: " Xiubo Li
2014-08-19 4:14 ` [PATCHv2 3/5] ASoC: fsl-spdif: " Xiubo Li
2014-08-19 4:14 ` [PATCHv2 4/5] ASoC: fsl-sai: " Xiubo Li
2014-08-19 4:14 ` Xiubo Li [this message]
[not found] ` <1408421693-9929-6-git-send-email-Li.Xiubo-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2014-08-25 1:50 ` [PATCHv2 5/5] ASoC: fsl-sai: rename big_endian_data to is_msb_first Nicolin Chen
2014-08-25 2:04 ` Li.Xiubo
[not found] ` <b938ef9cd0df48e985a91c931f6052e6-swgC6WJTr6EbUgZD/0KOGpwN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2014-08-25 2:43 ` Nicolin Chen
2014-08-25 3:11 ` Li.Xiubo-KZfg59tc24xl57MIdRCFDg
[not found] ` <21764759b9c447c7a3c6158e3bcfb3e6-swgC6WJTr6EbUgZD/0KOGpwN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2014-08-25 3:18 ` Nicolin Chen
2014-08-25 3:27 ` Li.Xiubo-KZfg59tc24xl57MIdRCFDg
2014-08-25 3:18 ` Timur Tabi
2014-08-25 3:22 ` Li.Xiubo
[not found] ` <53FAAB0D.2000403-N01EOCouUvQ@public.gmane.org>
2014-08-25 3:22 ` Nicolin Chen
2014-08-25 3:27 ` Li.Xiubo-KZfg59tc24xl57MIdRCFDg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408421693-9929-6-git-send-email-Li.Xiubo@freescale.com \
--to=li.xiubo-kzfg59tc24xl57midrcfdg@public.gmane.org \
--cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=nicoleotsuka-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=timur-N01EOCouUvQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).