Patchwork ARM i.MX5: fix obvious typo in ldb_di0_gate clk definition

login
register
mail settings
Submitter Lothar Waßmann
Date Dec. 10, 2013, 10:15 a.m.
Message ID <1386670515-6017-1-git-send-email-LW@KARO-electronics.de>
Download mbox | patch
Permalink /patch/299381/
State New
Headers show

Comments

Lothar Waßmann - Dec. 10, 2013, 10:15 a.m.
ldb_di0_gate is registerd with the clk index of IMX5_CLK_LDB_DI1_GATE,
thus the DI0 interface will be turned off inadvertently during boot.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
---
 arch/arm/mach-imx/clk-imx51-imx53.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Lucas Stach - Dec. 10, 2013, 10:20 a.m.
Adding Shawn to CC as likely he would be the one taking this patch.

Am Dienstag, den 10.12.2013, 11:15 +0100 schrieb Lothar Waßmann:
> ldb_di0_gate is registerd with the clk index of IMX5_CLK_LDB_DI1_GATE,
> thus the DI0 interface will be turned off inadvertently during boot.
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/mach-imx/clk-imx51-imx53.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
> index e349fd5..e063d93 100644
> --- a/arch/arm/mach-imx/clk-imx51-imx53.c
> +++ b/arch/arm/mach-imx/clk-imx51-imx53.c
> @@ -514,7 +514,7 @@ static void __init mx53_clocks_init(struct device_node *np)
>  	clk[IMX5_CLK_LDB_DI0_DIV]	= imx_clk_divider_flags("ldb_di0_div", "ldb_di0_div_3_5", MXC_CCM_CSCMR2, 10, 1, 0);
>  	clk[IMX5_CLK_LDB_DI0_SEL]	= imx_clk_mux_flags("ldb_di0_sel", MXC_CCM_CSCMR2, 8, 1,
>  						mx53_ldb_di0_sel, ARRAY_SIZE(mx53_ldb_di0_sel), CLK_SET_RATE_PARENT);
> -	clk[IMX5_CLK_LDB_DI1_GATE]	= imx_clk_gate2("ldb_di0_gate", "ldb_di0_div", MXC_CCM_CCGR6, 28);
> +	clk[IMX5_CLK_LDB_DI0_GATE]	= imx_clk_gate2("ldb_di0_gate", "ldb_di0_div", MXC_CCM_CCGR6, 28);
>  	clk[IMX5_CLK_LDB_DI1_GATE]	= imx_clk_gate2("ldb_di1_gate", "ldb_di1_div", MXC_CCM_CCGR6, 30);
>  	clk[IMX5_CLK_IPU_DI0_SEL]	= imx_clk_mux("ipu_di0_sel", MXC_CCM_CSCMR2, 26, 3,
>  						mx53_ipu_di0_sel, ARRAY_SIZE(mx53_ipu_di0_sel));
Lothar Waßmann - Dec. 10, 2013, 11:16 a.m.
Hi,

Lucas Stach wrote:
> Adding Shawn to CC as likely he would be the one taking this patch.
> 
|M:      Shawn Guo <shawn.guo@linaro.org>
|L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|S:      Maintained
|T:      git git://git.linaro.org/people/shawnguo/linux-2.6.git
|F:      arch/arm/mach-imx/*imx6*

shouldn't the MAINTAINERS entry be updated?


Lothar Waßmann
Shawn Guo - Dec. 10, 2013, 1:40 p.m.
On Tue, Dec 10, 2013 at 11:15:15AM +0100, Lothar Waßmann wrote:
> ldb_di0_gate is registerd with the clk index of IMX5_CLK_LDB_DI1_GATE,
> thus the DI0 interface will be turned off inadvertently during boot.
> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>

There should be a blank line between the commit log and your SoB.  I
fixed it up and applied the patch.

Shawn

> ---
>  arch/arm/mach-imx/clk-imx51-imx53.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
> index e349fd5..e063d93 100644
> --- a/arch/arm/mach-imx/clk-imx51-imx53.c
> +++ b/arch/arm/mach-imx/clk-imx51-imx53.c
> @@ -514,7 +514,7 @@ static void __init mx53_clocks_init(struct device_node *np)
>  	clk[IMX5_CLK_LDB_DI0_DIV]	= imx_clk_divider_flags("ldb_di0_div", "ldb_di0_div_3_5", MXC_CCM_CSCMR2, 10, 1, 0);
>  	clk[IMX5_CLK_LDB_DI0_SEL]	= imx_clk_mux_flags("ldb_di0_sel", MXC_CCM_CSCMR2, 8, 1,
>  						mx53_ldb_di0_sel, ARRAY_SIZE(mx53_ldb_di0_sel), CLK_SET_RATE_PARENT);
> -	clk[IMX5_CLK_LDB_DI1_GATE]	= imx_clk_gate2("ldb_di0_gate", "ldb_di0_div", MXC_CCM_CCGR6, 28);
> +	clk[IMX5_CLK_LDB_DI0_GATE]	= imx_clk_gate2("ldb_di0_gate", "ldb_di0_div", MXC_CCM_CCGR6, 28);
>  	clk[IMX5_CLK_LDB_DI1_GATE]	= imx_clk_gate2("ldb_di1_gate", "ldb_di1_div", MXC_CCM_CCGR6, 30);
>  	clk[IMX5_CLK_IPU_DI0_SEL]	= imx_clk_mux("ipu_di0_sel", MXC_CCM_CSCMR2, 26, 3,
>  						mx53_ipu_di0_sel, ARRAY_SIZE(mx53_ipu_di0_sel));
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sascha Hauer - Dec. 11, 2013, 7:34 a.m.
On Tue, Dec 10, 2013 at 10:19:21PM +0800, Shawn Guo wrote:
> I have been co-maintaining IMX sub-architecture for a couple of years,
> and collecting IMX sub-architecture patches rather than IMX6 only ones
> for a few release cycles.  It makes sense to officially add myself as
> the co-maintainer for IMX sub-architecture now.  Consequently, IMX6
> entry can just be merged into IMX.
> 
> While at it, add a 'F:' entry for IMX DTS files.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> ---
>  MAINTAINERS |   11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 13c15c8..c0cad90 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -894,18 +894,13 @@ F:	arch/arm/mach-footbridge/
>  
>  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
>  M:	Sascha Hauer <kernel@pengutronix.de>
> -L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> -S:	Maintained
> -T:	git git://git.pengutronix.de/git/imx/linux-2.6.git
> -F:	arch/arm/mach-imx/
> -F:	arch/arm/configs/imx*_defconfig
> -
> -ARM/FREESCALE IMX6
>  M:	Shawn Guo <shawn.guo@linaro.org>

Put yourself ontop since you're doing way more for i.MX than I do.
Otherwise:

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Sascha

>  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>  S:	Maintained
>  T:	git git://git.linaro.org/people/shawnguo/linux-2.6.git
> -F:	arch/arm/mach-imx/*imx6*
> +F:	arch/arm/mach-imx/
> +F:	arch/arm/boot/dts/imx*
> +F:	arch/arm/configs/imx*_defconfig
>  
>  ARM/FREESCALE MXS ARM ARCHITECTURE
>  M:	Shawn Guo <shawn.guo@linaro.org>
> -- 
> 1.7.9.5
> 
> 
>
Olof Johansson - Dec. 12, 2013, 1:12 a.m.
On Wed, Dec 11, 2013 at 08:34:47AM +0100, Sascha Hauer wrote:
> On Tue, Dec 10, 2013 at 10:19:21PM +0800, Shawn Guo wrote:
> > I have been co-maintaining IMX sub-architecture for a couple of years,
> > and collecting IMX sub-architecture patches rather than IMX6 only ones
> > for a few release cycles.  It makes sense to officially add myself as
> > the co-maintainer for IMX sub-architecture now.  Consequently, IMX6
> > entry can just be merged into IMX.
> > 
> > While at it, add a 'F:' entry for IMX DTS files.
> > 
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > Cc: Sascha Hauer <kernel@pengutronix.de>
> > ---
> >  MAINTAINERS |   11 +++--------
> >  1 file changed, 3 insertions(+), 8 deletions(-)
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 13c15c8..c0cad90 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -894,18 +894,13 @@ F:	arch/arm/mach-footbridge/
> >  
> >  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
> >  M:	Sascha Hauer <kernel@pengutronix.de>
> > -L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> > -S:	Maintained
> > -T:	git git://git.pengutronix.de/git/imx/linux-2.6.git
> > -F:	arch/arm/mach-imx/
> > -F:	arch/arm/configs/imx*_defconfig
> > -
> > -ARM/FREESCALE IMX6
> >  M:	Shawn Guo <shawn.guo@linaro.org>
> 
> Put yourself ontop since you're doing way more for i.MX than I do.
> Otherwise:
> 
> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

Applied to fixes for 3.13 (switching the two M: lines as you proposed).


-Olof
Shawn Guo - Dec. 12, 2013, 6:45 a.m.
On Wed, Dec 11, 2013 at 08:34:47AM +0100, Sascha Hauer wrote:
> Put yourself ontop since you're doing way more for i.MX than I do.
> Otherwise:
> 
> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

I have to say that I can not possibly do such work for i.MX without the
help from you and pengutronix people.  Thanks you, guys.

Shawn

Patch

diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index e349fd5..e063d93 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -514,7 +514,7 @@  static void __init mx53_clocks_init(struct device_node *np)
 	clk[IMX5_CLK_LDB_DI0_DIV]	= imx_clk_divider_flags("ldb_di0_div", "ldb_di0_div_3_5", MXC_CCM_CSCMR2, 10, 1, 0);
 	clk[IMX5_CLK_LDB_DI0_SEL]	= imx_clk_mux_flags("ldb_di0_sel", MXC_CCM_CSCMR2, 8, 1,
 						mx53_ldb_di0_sel, ARRAY_SIZE(mx53_ldb_di0_sel), CLK_SET_RATE_PARENT);
-	clk[IMX5_CLK_LDB_DI1_GATE]	= imx_clk_gate2("ldb_di0_gate", "ldb_di0_div", MXC_CCM_CCGR6, 28);
+	clk[IMX5_CLK_LDB_DI0_GATE]	= imx_clk_gate2("ldb_di0_gate", "ldb_di0_div", MXC_CCM_CCGR6, 28);
 	clk[IMX5_CLK_LDB_DI1_GATE]	= imx_clk_gate2("ldb_di1_gate", "ldb_di1_div", MXC_CCM_CCGR6, 30);
 	clk[IMX5_CLK_IPU_DI0_SEL]	= imx_clk_mux("ipu_di0_sel", MXC_CCM_CSCMR2, 26, 3,
 						mx53_ipu_di0_sel, ARRAY_SIZE(mx53_ipu_di0_sel));