Skip to contentSkip to conversation

ARM: mach-shmobile: Move sh7372 Mackerel external clk setup

PATCH Applied Magnus Damm 2 participants 4 messages Mar 6, 2012 – Mar 7, 2012

Subsystems (4)
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 1/1 ARM: mach-shmobile: Move sh7372 Mackerel external clk setup

From: Magnus Damm <[email protected]>

Move the board specific external clock setting for sh7372 Mackerel from machine_desc->sys_timer->init() to machine_desc->init_machine().

This is ground work for shmobile timer code consolidation.

---

 arch/arm/mach-shmobile/board-mackerel.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-shmobile/board-mackerel.c +3 -3
@@ -1348,6 +1348,9 @@ static void __init mackerel_init(void)
 	struct clk *clk;
 	int ret;
 
+	/* External clock source */
+	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
+
 	sh7372_pinmux_init();
 
 	/* enable SCIFA0 */
@@ -1555,9 +1558,6 @@ static void __init mackerel_timer_init(v
 {
 	sh7372_clock_init();
 	shmobile_timer.init();
-
-	/* External clock source */
-	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
 }
 
 static struct sys_timer mackerel_timer = {
author maintainer
#1 lore raw

PATCH 1/1 ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup

From: Magnus Damm <[email protected]>

Move the board specific external clock setting for sh7372 AP4EVB from machine_desc->sys_timer->init() to machine_desc->init_machine().

This is ground work for shmobile timer code consolidation.

---

 arch/arm/mach-shmobile/board-ap4evb.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-shmobile/board-ap4evb.c +3 -3
@@ -1197,6 +1197,9 @@ static void __init ap4evb_init(void)
 	u32 srcr4;
 	struct clk *clk;
 
+	/* External clock source */
+	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
+
 	sh7372_pinmux_init();
 
 	/* enable SCIFA0 */
@@ -1437,9 +1440,6 @@ static void __init ap4evb_timer_init(voi
 {
 	sh7372_clock_init();
 	shmobile_timer.init();
-
-	/* External clock source */
-	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
 }
 
 static struct sys_timer ap4evb_timer = {
#2 lore raw
In reply to Magnus Damm
Quoted 8 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Move the board specific external clock setting for sh7372 Mackerel from machine_desc->sys_timer->init() to machine_desc->init_machine().

This is ground work for shmobile timer code consolidation.

Applied.

Thanks,
Rafael

Quoted 29 lines

---

 arch/arm/mach-shmobile/board-mackerel.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-shmobile/board-mackerel.c +3 -3
@@ -1348,6 +1348,9 @@ static void __init mackerel_init(void)
 	struct clk *clk;
 	int ret;
 
+	/* External clock source */
+	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
+
 	sh7372_pinmux_init();
 
 	/* enable SCIFA0 */
@@ -1555,9 +1558,6 @@ static void __init mackerel_timer_init(v
 {
 	sh7372_clock_init();
 	shmobile_timer.init();
-
-	/* External clock source */
-	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
 }
 
 static struct sys_timer mackerel_timer = {
#3 lore raw

Re: [PATCH] ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup

In reply to Magnus Damm
Quoted 8 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Move the board specific external clock setting for sh7372 AP4EVB from machine_desc->sys_timer->init() to machine_desc->init_machine().

This is ground work for shmobile timer code consolidation.

Applied.

Thanks,
Rafael

Quoted 29 lines

---

 arch/arm/mach-shmobile/board-ap4evb.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-shmobile/board-ap4evb.c +3 -3
@@ -1197,6 +1197,9 @@ static void __init ap4evb_init(void)
 	u32 srcr4;
 	struct clk *clk;
 
+	/* External clock source */
+	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
+
 	sh7372_pinmux_init();
 
 	/* enable SCIFA0 */
@@ -1437,9 +1440,6 @@ static void __init ap4evb_timer_init(voi
 {
 	sh7372_clock_init();
 	shmobile_timer.init();
-
-	/* External clock source */
-	clk_set_rate(&sh7372_dv_clki_clk, 27000000);
 }
 
 static struct sys_timer ap4evb_timer = {