Skip to contentSkip to conversation

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

PATCH New Lothar Waßmann 5 participants 8 messages Dec 10, 2013 – Dec 12, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM i.MX5: fix obvious typo in ldb_di0_gate clk definition

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.

---
 arch/arm/mach-imx/clk-imx51-imx53.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-imx/clk-imx51-imx53.c +1 -1
index e349fd5..e063d93 100644
@@ -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));
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 1/1 ARM i.MX5: fix obvious typo in ldb_di0_gate clk definition

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:

Quoted 3 lines

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.

Quoted 17 lines
---
 arch/arm/mach-imx/clk-imx51-imx53.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-imx/clk-imx51-imx53.c +1 -1
index e349fd5..e063d93 100644
@@ -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));
Signature · 4 lines
Pengutronix e.K.                           | Lucas Stach                 |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#2 lore raw

PATCH 1/1 ARM i.MX5: fix obvious typo in ldb_di0_gate clk definition

Hi,

Quoted 2 lines · Lucas Stach

Adding Shawn to CC as likely he would be the one taking this patch.

|M:      Shawn Guo <[email protected]>
|L:      linux-arm-kernel at 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

Signature · 9 lines
___________________________________________________________

Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996

www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________
#3 lore raw

PATCH 1/1 MAINTAINERS: merge IMX6 entry into IMX

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.

Cc Sascha Hauer <[email protected]>
---
 MAINTAINERS |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
MAINTAINERS +3 -8
index 13c15c8..c0cad90 100644
@@ -894,18 +894,13 @@ F:	arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:	Sascha Hauer <[email protected]>
-L:	linux-arm-kernel at 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 <[email protected]>
 L:	linux-arm-kernel at 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 <[email protected]>
Signature · 1 line
1.7.9.5
maintainer
#4 lore raw

PATCH 1/1 MAINTAINERS: merge IMX6 entry into IMX

Quoted 20 lines · Shawn Guo

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.

Cc Sascha Hauer <[email protected]>
---
 MAINTAINERS |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
MAINTAINERS +0 -0
index 13c15c8..c0cad90 100644
@@ -894,18 +894,13 @@ F:	arch/arm/mach-footbridge/
 

MAINTAINERS F: arch/arm/mach-footbridge/ · line 897

Quoted 10 lines
MAINTAINERS +0 -7
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:	Sascha Hauer <[email protected]>
-L:	linux-arm-kernel at 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 <[email protected]>

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

Sascha

Quoted 15 lines
MAINTAINERS +3 -1
 L:	linux-arm-kernel at 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 <[email protected]>
Signature · 1 line
1.7.9.5
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#5 lore raw

PATCH 1/1 MAINTAINERS: merge IMX6 entry into IMX

Quoted 35 lines · Sascha Hauer
Quoted 20 lines · Shawn Guo

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.

Cc Sascha Hauer <[email protected]>
---
 MAINTAINERS |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
MAINTAINERS +0 -0
index 13c15c8..c0cad90 100644
@@ -894,18 +894,13 @@ F:	arch/arm/mach-footbridge/
 

MAINTAINERS F: arch/arm/mach-footbridge/ · line 897

Quoted 10 lines
MAINTAINERS +0 -7
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:	Sascha Hauer <[email protected]>
-L:	linux-arm-kernel at 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 <[email protected]>

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

Quoted 1 line

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

-Olof

#6 lore raw

PATCH 1/1 MAINTAINERS: merge IMX6 entry into IMX

In reply to Sascha Hauer
Quoted 4 lines · Sascha Hauer

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

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

#7 lore raw

PATCH 1/1 ARM i.MX5: fix obvious typo in ldb_di0_gate clk definition

In reply to Lothar Waßmann
Quoted 3 lines · 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.

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

Shawn

Quoted 25 lines
---
 arch/arm/mach-imx/clk-imx51-imx53.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-imx/clk-imx51-imx53.c +1 -1
index e349fd5..e063d93 100644
@@ -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));
Signature · 7 lines
1.7.2.5


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel