* [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support.
@ 2014-04-04 7:10 Xiubo Li
2014-04-04 7:10 ` [PATCHv2 1/4] ASoC: esai: use the precise definition of 'ret' Xiubo Li
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Xiubo Li @ 2014-04-04 7:10 UTC (permalink / raw)
To: broonie, Guangyu.Chen; +Cc: alsa-devel, Xiubo Li, festevam
Changes in V2:
- Revise some issue from Nicolin Chen and Fabio Estevam.
Xiubo Li (4):
ASoC: esai: use the precise definition of 'ret'.
ASoC: spdif: Sort the header files alphabetically.
ASoC: esai: Add VF610+ compatibles support.
ASoC: spdif: Add VF610+ compatibles support.
sound/soc/fsl/fsl_esai.c | 9 ++++++---
sound/soc/fsl/fsl_spdif.c | 9 +++++----
2 files changed, 11 insertions(+), 7 deletions(-)
--
1.8.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCHv2 1/4] ASoC: esai: use the precise definition of 'ret'.
2014-04-04 7:10 [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Xiubo Li
@ 2014-04-04 7:10 ` Xiubo Li
2014-04-04 7:10 ` [PATCHv2 2/4] ASoC: spdif: Sort the header files alphabetically Xiubo Li
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Xiubo Li @ 2014-04-04 7:10 UTC (permalink / raw)
To: broonie, Guangyu.Chen; +Cc: alsa-devel, Xiubo Li, festevam
Use the precise definition of 'ret', which will be used for
the error check.
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
sound/soc/fsl/fsl_esai.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index c8e5db1..67d5417 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -209,8 +209,9 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
struct clk *clksrc = esai_priv->extalclk;
bool tx = clk_id <= ESAI_HCKT_EXTAL;
bool in = dir == SND_SOC_CLOCK_IN;
- u32 ret, ratio, ecr = 0;
+ u32 ratio, ecr = 0;
unsigned long clk_rate;
+ int ret;
/* sck_div can be only bypassed if ETO/ERO=0 and SNC_SOC_CLOCK_OUT */
esai_priv->sck_div[tx] = true;
@@ -432,8 +433,8 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
static int fsl_esai_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
- int ret;
struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
+ int ret;
/*
* Some platforms might use the same bit to gate all three or two of
@@ -491,7 +492,8 @@ static int fsl_esai_hw_params(struct snd_pcm_substream *substream,
bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
u32 width = snd_pcm_format_width(params_format(params));
u32 channels = params_channels(params);
- u32 bclk, mask, val, ret;
+ u32 bclk, mask, val;
+ int ret;
bclk = params_rate(params) * esai_priv->slot_width * 2;
--
1.8.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCHv2 2/4] ASoC: spdif: Sort the header files alphabetically.
2014-04-04 7:10 [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Xiubo Li
2014-04-04 7:10 ` [PATCHv2 1/4] ASoC: esai: use the precise definition of 'ret' Xiubo Li
@ 2014-04-04 7:10 ` Xiubo Li
2014-04-04 7:10 ` [PATCHv2 3/4] ASoC: esai: Add VF610+ compatibles support Xiubo Li
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Xiubo Li @ 2014-04-04 7:10 UTC (permalink / raw)
To: broonie, Guangyu.Chen; +Cc: alsa-devel, Xiubo Li, festevam
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Acked-by: Nicolin Chen <Guangyu.Chen@freescale.com>
---
sound/soc/fsl/fsl_spdif.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 6452ca8..173553c 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -13,18 +13,18 @@
* kind, whether express or implied.
*/
-#include <linux/module.h>
+#include <linux/bitrev.h>
#include <linux/clk.h>
#include <linux/clk-private.h>
-#include <linux/bitrev.h>
-#include <linux/regmap.h>
+#include <linux/module.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
#include <linux/of_irq.h>
+#include <linux/regmap.h>
#include <sound/asoundef.h>
-#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
+#include <sound/soc.h>
#include "fsl_spdif.h"
#include "imx-pcm.h"
--
1.8.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCHv2 3/4] ASoC: esai: Add VF610+ compatibles support.
2014-04-04 7:10 [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Xiubo Li
2014-04-04 7:10 ` [PATCHv2 1/4] ASoC: esai: use the precise definition of 'ret' Xiubo Li
2014-04-04 7:10 ` [PATCHv2 2/4] ASoC: spdif: Sort the header files alphabetically Xiubo Li
@ 2014-04-04 7:10 ` Xiubo Li
2014-04-04 7:10 ` [PATCHv2 4/4] ASoC: spdif: " Xiubo Li
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Xiubo Li @ 2014-04-04 7:10 UTC (permalink / raw)
To: broonie, Guangyu.Chen; +Cc: alsa-devel, Xiubo Li, festevam
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
sound/soc/fsl/fsl_esai.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 67d5417..b49b78d 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -818,6 +818,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
static const struct of_device_id fsl_esai_dt_ids[] = {
{ .compatible = "fsl,imx35-esai", },
+ { .compatible = "fsl,vf610-esai", },
{}
};
MODULE_DEVICE_TABLE(of, fsl_esai_dt_ids);
--
1.8.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCHv2 4/4] ASoC: spdif: Add VF610+ compatibles support.
2014-04-04 7:10 [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Xiubo Li
` (2 preceding siblings ...)
2014-04-04 7:10 ` [PATCHv2 3/4] ASoC: esai: Add VF610+ compatibles support Xiubo Li
@ 2014-04-04 7:10 ` Xiubo Li
2014-04-04 7:46 ` [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Nicolin Chen
2014-04-14 20:45 ` Mark Brown
5 siblings, 0 replies; 7+ messages in thread
From: Xiubo Li @ 2014-04-04 7:10 UTC (permalink / raw)
To: broonie, Guangyu.Chen; +Cc: alsa-devel, Xiubo Li, festevam
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
sound/soc/fsl/fsl_spdif.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 173553c..daa6198 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -1186,6 +1186,7 @@ static int fsl_spdif_probe(struct platform_device *pdev)
static const struct of_device_id fsl_spdif_dt_ids[] = {
{ .compatible = "fsl,imx35-spdif", },
+ { .compatible = "fsl,vf610-spdif", },
{}
};
MODULE_DEVICE_TABLE(of, fsl_spdif_dt_ids);
--
1.8.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support.
2014-04-04 7:10 [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Xiubo Li
` (3 preceding siblings ...)
2014-04-04 7:10 ` [PATCHv2 4/4] ASoC: spdif: " Xiubo Li
@ 2014-04-04 7:46 ` Nicolin Chen
2014-04-14 20:45 ` Mark Brown
5 siblings, 0 replies; 7+ messages in thread
From: Nicolin Chen @ 2014-04-04 7:46 UTC (permalink / raw)
To: Xiubo Li; +Cc: alsa-devel, broonie, festevam
On Fri, Apr 04, 2014 at 03:10:25PM +0800, Xiubo Li wrote:
> Changes in V2:
> - Revise some issue from Nicolin Chen and Fabio Estevam.
You have my ACK for all of them.
Thanks,
Nicolin
>
>
> Xiubo Li (4):
> ASoC: esai: use the precise definition of 'ret'.
> ASoC: spdif: Sort the header files alphabetically.
> ASoC: esai: Add VF610+ compatibles support.
> ASoC: spdif: Add VF610+ compatibles support.
>
> sound/soc/fsl/fsl_esai.c | 9 ++++++---
> sound/soc/fsl/fsl_spdif.c | 9 +++++----
> 2 files changed, 11 insertions(+), 7 deletions(-)
>
> --
> 1.8.4
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support.
2014-04-04 7:10 [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Xiubo Li
` (4 preceding siblings ...)
2014-04-04 7:46 ` [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Nicolin Chen
@ 2014-04-14 20:45 ` Mark Brown
5 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2014-04-14 20:45 UTC (permalink / raw)
To: Xiubo Li; +Cc: alsa-devel, festevam, Guangyu.Chen
[-- Attachment #1.1: Type: text/plain, Size: 156 bytes --]
On Fri, Apr 04, 2014 at 03:10:25PM +0800, Xiubo Li wrote:
> Changes in V2:
> - Revise some issue from Nicolin Chen and Fabio Estevam.
Applied all, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-04-14 20:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-04 7:10 [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Xiubo Li
2014-04-04 7:10 ` [PATCHv2 1/4] ASoC: esai: use the precise definition of 'ret' Xiubo Li
2014-04-04 7:10 ` [PATCHv2 2/4] ASoC: spdif: Sort the header files alphabetically Xiubo Li
2014-04-04 7:10 ` [PATCHv2 3/4] ASoC: esai: Add VF610+ compatibles support Xiubo Li
2014-04-04 7:10 ` [PATCHv2 4/4] ASoC: spdif: " Xiubo Li
2014-04-04 7:46 ` [PATCHv2 0/4] Add ESAI & SPDIF Vybrid and LS1+ support Nicolin Chen
2014-04-14 20:45 ` Mark Brown
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).