Skip to contentSkip to conversation

arm: socfpga: Add clock for smp_twd timer

PATCH New dinguyen at altera.com 3 participants 7 messages Sep 17, 2013 – Dec 2, 2013

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

PATCH 1/2 arm: socfpga: Add clock for smp_twd timer

From: Dinh Nguyen <[email protected]>

Assign a clock for the twd-timer.

Cc Rob Herring <[email protected]>
Cc Pawel Moll <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Ian Campbell <[email protected]>
CC linux-arm-kernel at lists.infradead.org
---
 arch/arm/boot/dts/socfpga.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +2 -2
index acd6c3a..e28df94 100644
@@ -480,11 +480,11 @@
 			clock-names = "biu", "ciu";
 		};
 
-		/* Local timer */
-		timer at fffec600 {
+		local-timer at fffec600 {
 			compatible = "arm,cortex-a9-twd-timer";
 			reg = <0xfffec600 0x100>;
 			interrupts = <1 13 0xf04>;
+			clocks = <&mpu_periph_clk>;
 		};
 
 		timer0: timer0 at ffc08000 {
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 arm: socfpga: Add clock for smp_twd timer

Hi,

Just wondering if I can get any comments on this patchset?

Thanks,
Dinh

Quoted 33 lines · Dinh Nguyen

From: Dinh Nguyen <[email protected]>

Assign a clock for the twd-timer.

Cc Rob Herring <[email protected]>
Cc Pawel Moll <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Ian Campbell <[email protected]>
CC linux-arm-kernel at lists.infradead.org
---
 arch/arm/boot/dts/socfpga.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +2 -2
index acd6c3a..e28df94 100644
@@ -480,11 +480,11 @@
 			clock-names = "biu", "ciu";
 		};
 
-		/* Local timer */
-		timer at fffec600 {
+		local-timer at fffec600 {
 			compatible = "arm,cortex-a9-twd-timer";
 			reg = <0xfffec600 0x100>;
 			interrupts = <1 13 0xf04>;
+			clocks = <&mpu_periph_clk>;
 		};
 
 		timer0: timer0 at ffc08000 {
#2 lore raw

PATCH 2/2 arm: socfpga: Remove socfpga_init_clocks

In reply to dinguyen at altera.com

From: Dinh Nguyen <[email protected]>

The smp_twd clock can be represented in DTS, so there is no need for socfpga_init_clocks().

CC Arnd Bergmann <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Mike Turquette <[email protected]>
Cc linux-arm-kernel at lists.infradead.org
---
 arch/arm/mach-socfpga/socfpga.c |    1 -
 drivers/clk/socfpga/clk.c       |   11 -----------
 2 files changed, 12 deletions(-)
arch/arm/mach-socfpga/socfpga.c +0 -1
index bfce964..5314fc2 100644
@@ -108,7 +108,6 @@ static void __init socfpga_cyclone5_init(void)
 	l2x0_of_init(0, ~0UL);
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 	of_clk_init(NULL);
-	socfpga_init_clocks();
 }
 
 static const char *altera_dt_match[] = {
drivers/clk/socfpga/clk.c +0 -11
index c378489..24580b7 100644
@@ -333,14 +333,3 @@ static void __init socfpga_gate_init(struct device_node *node)
 	socfpga_gate_clk_init(node, &gateclk_ops);
 }
 CLK_OF_DECLARE(socfpga_gate, "altr,socfpga-gate-clk", socfpga_gate_init);
-
-void __init socfpga_init_clocks(void)
-{
-	struct clk *clk;
-	int ret;
-
-	clk = clk_register_fixed_factor(NULL, "smp_twd", "mpuclk", 0, 1, 4);
-	ret = clk_register_clkdev(clk, NULL, "smp_twd");
-	if (ret)
-		pr_err("smp_twd alias not registered\n");
-}
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 1/2 arm: socfpga: Add clock for smp_twd timer

In reply to dinguyen at altera.com
Quoted 20 lines · dinguyen at altera.com

From: Dinh Nguyen <[email protected]>

Assign a clock for the twd-timer.

Cc Rob Herring <[email protected]>
Cc Pawel Moll <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Ian Campbell <[email protected]>
CC linux-arm-kernel at lists.infradead.org
---
 arch/arm/boot/dts/socfpga.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +0 -0
index acd6c3a..e28df94 100644

arch/arm/boot/dts/socfpga.dtsi line 483

Quoted 6 lines
arch/arm/boot/dts/socfpga.dtsi +1 -2
@@ -480,11 +480,11 @@
 			clock-names = "biu", "ciu";
 		};
 
-		/* Local timer */
-		timer at fffec600 {
+		local-timer at fffec600 {

timer was the right name.

arch/arm/boot/dts/socfpga.dtsi line 487

Quoted 4 lines
arch/arm/boot/dts/socfpga.dtsi +1 -0
 			compatible = "arm,cortex-a9-twd-timer";
 			reg = <0xfffec600 0x100>;
 			interrupts = <1 13 0xf04>;
+			clocks = <&mpu_periph_clk>;

Otherwise, this looks fine and I wouldn't expect much input on a change that doesn't add a new binding.

Rob

Quoted 4 lines
arch/arm/boot/dts/socfpga.dtsi +0 -0
 		};
 
 		timer0: timer0 at ffc08000 {
#4 lore raw

PATCH 1/2 arm: socfpga: Add clock for smp_twd timer

Quoted 24 lines · Rob Herring
Quoted 23 lines · dinguyen at altera.com

From: Dinh Nguyen <[email protected]>

Assign a clock for the twd-timer.

Cc Rob Herring <[email protected]>
Cc Pawel Moll <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Ian Campbell <[email protected]>
CC linux-arm-kernel at lists.infradead.org
---
 arch/arm/boot/dts/socfpga.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +0 -0
index acd6c3a..e28df94 100644
@@ -480,11 +480,11 @@
 			clock-names = "biu", "ciu";
 		};
 
Quoted 5 lines

arch/arm/boot/dts/socfpga.dtsi line 483

Quoted 3 lines
arch/arm/boot/dts/socfpga.dtsi +1 -2
-		/* Local timer */
-		timer at fffec600 {
+		local-timer at fffec600 {

timer was the right name.

I'll put it back...

Quoted 10 lines

arch/arm/boot/dts/socfpga.dtsi line 487

Quoted 5 lines
arch/arm/boot/dts/socfpga.dtsi +1 -0
 			compatible = "arm,cortex-a9-twd-timer";
 			reg = <0xfffec600 0x100>;
 			interrupts = <1 13 0xf04>;
+			clocks = <&mpu_periph_clk>;

Otherwise, this looks fine and I wouldn't expect much input on a change that doesn't add a new binding.

Thanks Rob!

Dinh

Quoted 9 lines

Rob

Quoted 4 lines
arch/arm/boot/dts/socfpga.dtsi +0 -0
 		};
 
 		timer0: timer0 at ffc08000 {
#5 lore raw

PATCH 1/2 arm: socfpga: Add clock for smp_twd timer

Quoting Dinh Nguyen (2013-10-01 12:35:55)

Quoted 39 lines · Rob Herring
Quoted 24 lines · dinguyen at altera.com
Quoted 23 lines

From: Dinh Nguyen <[email protected]>

Assign a clock for the twd-timer.

Cc Rob Herring <[email protected]>
Cc Pawel Moll <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Ian Campbell <[email protected]>
CC linux-arm-kernel at lists.infradead.org
---
 arch/arm/boot/dts/socfpga.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +0 -0
index acd6c3a..e28df94 100644
@@ -480,11 +480,11 @@
                    clock-names = "biu", "ciu";
            };
 
Quoted 5 lines

arch/arm/boot/dts/socfpga.dtsi line 483

Quoted 3 lines
arch/arm/boot/dts/socfpga.dtsi +1 -2
-           /* Local timer */
-           timer at fffec600 {
+           local-timer at fffec600 {

timer was the right name.

I'll put it back...

Quoted 6 lines
Quoted 5 lines
arch/arm/boot/dts/socfpga.dtsi +1 -0
                    compatible = "arm,cortex-a9-twd-timer";
                    reg = <0xfffec600 0x100>;
                    interrupts = <1 13 0xf04>;
+                   clocks = <&mpu_periph_clk>;
Quoted 6 lines
Quoted 4 lines

Otherwise, this looks fine and I wouldn't expect much input on a change that doesn't add a new binding.

Thanks Rob!

Looks good to me too. Can you respin it with the fix for 'timer' and I'll take it in?

Thanks,
Mike

Quoted 19 lines

Dinh

Quoted 9 lines

Rob

Quoted 4 lines
arch/arm/boot/dts/socfpga.dtsi +0 -0
            };
 
            timer0: timer0 at ffc08000 {

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

#6 lore raw

PATCH 1/2 arm: socfpga: Add clock for smp_twd timer

Quoted 43 lines · Mike Turquette

Quoting Dinh Nguyen (2013-10-01 12:35:55)

Quoted 42 lines · Rob Herring
Quoted 24 lines · dinguyen at altera.com
Quoted 23 lines

From: Dinh Nguyen <[email protected]>

Assign a clock for the twd-timer.

Cc Rob Herring <[email protected]>
Cc Pawel Moll <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Stephen Warren <[email protected]>
Cc Ian Campbell <[email protected]>
CC linux-arm-kernel at lists.infradead.org
---
 arch/arm/boot/dts/socfpga.dtsi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/socfpga.dtsi +0 -0
index acd6c3a..e28df94 100644
@@ -480,11 +480,11 @@
                    clock-names = "biu", "ciu";
            };
 
Quoted 5 lines

arch/arm/boot/dts/socfpga.dtsi line 483

Quoted 3 lines
arch/arm/boot/dts/socfpga.dtsi +1 -2
-           /* Local timer */
-           timer at fffec600 {
+           local-timer at fffec600 {

timer was the right name.

I'll put it back...

Quoted 9 lines

arch/arm/boot/dts/socfpga.dtsi line 487

Quoted 5 lines
arch/arm/boot/dts/socfpga.dtsi +1 -0
                    compatible = "arm,cortex-a9-twd-timer";
                    reg = <0xfffec600 0x100>;
                    interrupts = <1 13 0xf04>;
+                   clocks = <&mpu_periph_clk>;

Otherwise, this looks fine and I wouldn't expect much input on a change that doesn't add a new binding.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Thanks Rob!

Looks good to me too. Can you respin it with the fix for 'timer' and I'll take it in?

This already went in through the DTS bindings tree.

Thanks,
Dinh

Quoted 24 lines

Thanks,
Mike

Quoted 19 lines

Dinh

Quoted 9 lines

Rob

Quoted 4 lines
arch/arm/boot/dts/socfpga.dtsi +0 -0
            };
 
            timer0: timer0 at ffc08000 {

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