Patchwork [4/4] ARM: mx28evk: add missed clkmux select for saif

login
register
mail settings
Submitter Dong Aisheng
Date July 20, 2012, 9:20 a.m.
Message ID <1342776027-31758-5-git-send-email-b29396@freescale.com>
Download mbox | patch
Permalink /patch/172189/
State New
Headers show

Comments

Dong Aisheng - July 20, 2012, 9:20 a.m.
From: Dong Aisheng <dong.aisheng@linaro.org>

Added missed clkmux setting for mx28evk.

Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
---
 arch/arm/mach-mxs/mach-mxs.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
Shawn Guo - July 21, 2012, 7:40 a.m.
On Fri, Jul 20, 2012 at 05:20:27PM +0800, Dong Aisheng wrote:
> From: Dong Aisheng <dong.aisheng@linaro.org>
> 
> Added missed clkmux setting for mx28evk.
> 
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
> ---
>  arch/arm/mach-mxs/mach-mxs.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> index 8cac94b..82f27a4 100644
> --- a/arch/arm/mach-mxs/mach-mxs.c
> +++ b/arch/arm/mach-mxs/mach-mxs.c
> @@ -21,6 +21,7 @@
>  #include <asm/mach/arch.h>
>  #include <asm/mach/time.h>
>  #include <mach/common.h>
> +#include <mach/digctl.h>
>  
>  static int __init mxs_icoll_add_irq_domain(struct device_node *np,
>  				struct device_node *interrupt_parent)
> @@ -79,6 +80,8 @@ static void __init imx28_evk_init(void)
>  	clk = clk_get_sys("enet_out", NULL);
>  	if (!IS_ERR(clk))
>  		clk_prepare_enable(clk);
> +
> +	mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);

Is this a board specific setup?  Or every single imx28 based board that
wants recording function is going to need this setup?

BTW, the patch needs to get rebased on v3.6-rc1, where mach-mxs.c will
have some context update.

Regards,
Shawn

>  }
>  
>  static void __init mxs_machine_init(void)
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Dong Aisheng - July 23, 2012, 2:36 a.m.
On Sat, Jul 21, 2012 at 03:40:04PM +0800, Shawn Guo wrote:
> On Fri, Jul 20, 2012 at 05:20:27PM +0800, Dong Aisheng wrote:
> > From: Dong Aisheng <dong.aisheng@linaro.org>
> > 
> > Added missed clkmux setting for mx28evk.
> > 
> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > Cc: Liam Girdwood <lrg@ti.com>
> > Cc: Wolfram Sang <w.sang@pengutronix.de>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
> > Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
> > ---
> >  arch/arm/mach-mxs/mach-mxs.c |    3 +++
> >  1 files changed, 3 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> > index 8cac94b..82f27a4 100644
> > --- a/arch/arm/mach-mxs/mach-mxs.c
> > +++ b/arch/arm/mach-mxs/mach-mxs.c
> > @@ -21,6 +21,7 @@
> >  #include <asm/mach/arch.h>
> >  #include <asm/mach/time.h>
> >  #include <mach/common.h>
> > +#include <mach/digctl.h>
> >  
> >  static int __init mxs_icoll_add_irq_domain(struct device_node *np,
> >  				struct device_node *interrupt_parent)
> > @@ -79,6 +80,8 @@ static void __init imx28_evk_init(void)
> >  	clk = clk_get_sys("enet_out", NULL);
> >  	if (!IS_ERR(clk))
> >  		clk_prepare_enable(clk);
> > +
> > +	mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
> 
> Is this a board specific setup?  Or every single imx28 based board that
> wants recording function is going to need this setup?
> 
Yes, this is a board specific setup, just as non-dt does currently.
Different boards may have different setting.

> BTW, the patch needs to get rebased on v3.6-rc1, where mach-mxs.c will
> have some context update.
> 
I can do it.
This patch series was made based on Mark's sound-2.6 tree.
Do you want this one go through mxs tree and other three go through Mark's tree?
I'm thinking maybe it would be better go through one tree(Mark's or Yours) since
without this one the saif record still can not work.
Maybe go through yours may save some conflicts.

Mark,
What's your suggestion?

Regards
Dong Aisheng
Shawn Guo - July 28, 2012, 8:25 a.m.
On Mon, Jul 23, 2012 at 10:36:33AM +0800, Dong Aisheng wrote:
> This patch series was made based on Mark's sound-2.6 tree.
> Do you want this one go through mxs tree and other three go through Mark's tree?

Yes.  That's the way to save conflict.

> I'm thinking maybe it would be better go through one tree(Mark's or Yours) since
> without this one the saif record still can not work.

The recording has been broken.  There is no point to force the whole
series to go via one tree.  When sound and arm-soc get merged on
linux-next (for testing) and mainline, the recording gets back to work.
Dong Aisheng - Aug. 1, 2012, 2:47 a.m.
On Sat, Jul 28, 2012 at 04:25:48PM +0800, Shawn Guo wrote:
> On Mon, Jul 23, 2012 at 10:36:33AM +0800, Dong Aisheng wrote:
> > This patch series was made based on Mark's sound-2.6 tree.
> > Do you want this one go through mxs tree and other three go through Mark's tree?
> 
> Yes.  That's the way to save conflict.
> 
> > I'm thinking maybe it would be better go through one tree(Mark's or Yours) since
> > without this one the saif record still can not work.
> 
> The recording has been broken.  There is no point to force the whole
> series to go via one tree.  When sound and arm-soc get merged on
> linux-next (for testing) and mainline, the recording gets back to work.
> 
Understand.
Will rebase it and resend it for this one.

Regards
Dong Aisheng

Patch

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 8cac94b..82f27a4 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -21,6 +21,7 @@ 
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <mach/common.h>
+#include <mach/digctl.h>
 
 static int __init mxs_icoll_add_irq_domain(struct device_node *np,
 				struct device_node *interrupt_parent)
@@ -79,6 +80,8 @@  static void __init imx28_evk_init(void)
 	clk = clk_get_sys("enet_out", NULL);
 	if (!IS_ERR(clk))
 		clk_prepare_enable(clk);
+
+	mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
 }
 
 static void __init mxs_machine_init(void)