clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Subsystems (5)
PATCH v2 1/2 clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
From: Dinh Nguyen <[email protected]>
Make a common device tree glue for clocksource/dw_apb_timer. Move mach-picoxcell/time.c to be a generic device tree application of the dw_apb_timer.
--- Documentation/devicetree/bindings/rtc/dw-apb.txt | 24 ++++++++++ arch/arm/Kconfig | 1 + drivers/clocksource/Kconfig | 3 ++ drivers/clocksource/Makefile | 1 + .../clocksource/dw_apb_timer_of.c | 49 +++++++++++--------- 5 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/dw-apb.txt rename arch/arm/mach-picoxcell/time.c => drivers/clocksource/dw_apb_timer_of.c (60%)
Documentation/devicetree/bindings/rtc/dw-apb.txt new file +24 -0
@@ -0,0 +1,24 @@ +* Designware APB timer + +Required properties: +- compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc" +- reg: physical base address of the controller and length of memory mapped + region. +- interrupts: IRQ line for the timer. +- clock-freq: The frequency in HZ of the timer. + +Example: + + timer1: timer at ffc09000 { + compatible = "snps,dw-apb-timer-sp"; + interrupts = <0 168 4>; + clock-freq = <200000000>; + reg = <0xffc09000 0x1000>; + }; + + timer2: timer at ffd00000 { + compatible = "snps,dw-apb-timer-osc"; + interrupts = <0 169 4>; + clock-freq = <200000000>; + reg = <0xffd00000 0x1000>; + };
arch/arm/Kconfig +1 -0
@@ -658,6 +658,7 @@ config ARCH_PICOXCELL select ARM_VIC select CPU_V6K select DW_APB_TIMER + select DW_APB_TIMER_OF select GENERIC_CLOCKEVENTS select GENERIC_GPIO select HAVE_TCM
drivers/clocksource/Kconfig +3 -0
@@ -15,6 +15,9 @@ config CLKSRC_MMIO config DW_APB_TIMER bool + +config DW_APB_TIMER_OF + bool config CLKSRC_DBX500_PRCMU bool "Clocksource PRCMU Timer"
drivers/clocksource/Makefile +1 -0
@@ -10,4 +10,5 @@ obj-$(CONFIG_EM_TIMER_STI) += em_sti.o obj-$(CONFIG_CLKBLD_I8253) += i8253.o obj-$(CONFIG_CLKSRC_MMIO) += mmio.o obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o +obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +28 -21
116 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v2 2/2 arm: picoxcell: Make use of dw_apb_timer_of
From: Dinh Nguyen <[email protected]>
Make use of the move dw_apb_timer_of device tree implementation in clocksource.
--- arch/arm/mach-picoxcell/Makefile | 1 - arch/arm/mach-picoxcell/common.c | 3 ++- arch/arm/mach-picoxcell/common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-picoxcell/Makefile +0 -1
@@ -1,2 +1 @@ obj-y := common.o -obj-y += time.o
arch/arm/mach-picoxcell/common.c +2 -1
@@ -14,6 +14,7 @@#include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/dw_apb_timer.h> #include <asm/mach/arch.h> #include <asm/hardware/vic.h>
@@ -97,7 +98,7 @@ DT_MACHINE_START(PICOXCELL, "Picochip picoXcell") .nr_irqs = NR_IRQS_LEGACY, .init_irq = picoxcell_init_irq, .handle_irq = vic_handle_irq, - .timer = &picoxcell_timer, + .timer = &dw_apb_timer, .init_machine = picoxcell_init_machine, .dt_compat = picoxcell_dt_match, .restart = picoxcell_wdt_restart,
arch/arm/mach-picoxcell/common.h +1 -1
@@ -12,6 +12,6 @@#include <asm/mach/time.h> -extern struct sys_timer picoxcell_timer; +extern struct sys_timer dw_apb_timer;#endif /* __PICOXCELL_COMMON_H__ */
Signature · 1 line
1.7.9.5
PATCH v2 1/2 clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
In reply to dinguyen at altera.comHi,
Quoted 27 lines · dinguyen at altera.com
From: Dinh Nguyen <[email protected]>
Make a common device tree glue for clocksource/dw_apb_timer. Move
mach-picoxcell/time.cto be a generic device tree application of thedw_apb_timer.Signed-off-by Pavel Machek <[email protected]>Signed-off-by Dinh Nguyen <[email protected]>--- Documentation/devicetree/bindings/rtc/dw-apb.txt | 24 ++++++++++ arch/arm/Kconfig | 1 + drivers/clocksource/Kconfig | 3 ++ drivers/clocksource/Makefile | 1 + .../clocksource/dw_apb_timer_of.c | 49 +++++++++++--------- 5 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/dw-apb.txt rename arch/arm/mach-picoxcell/time.c => drivers/clocksource/dw_apb_timer_of.c (60%)drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +0
-0@@ -1,11 +1,20 @@
[...]
drivers/clocksource/dw_apb_timer_of.c static void picoxcell_add_clocksource(struct device_node *source_timer) · line 84
Quoted 5 lines
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +2
-2-static const struct of_device_id picoxcell_rtc_ids[]__initconst = { - { .compatible ="picochip,pc3x2-rtc" }, +static const struct of_device_id sptimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-sp" }, {/* Sentinel */ },
Please keep picochip,pc3x2-rtc in the compatible list otherwise we won't boot any more.
drivers/clocksource/dw_apb_timer_of.c static void picoxcell_add_clocksource(struct device_node *source_timer) · line 105
Quoted 7 lines
-static const struct
of_device_idpicoxcell_timer_ids[]__initconst= {drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +2
-1- { .compatible = "picochip,pc3x2-timer" }, +static const struct of_device_id osctimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-osc" }, {}, };
The same here. Also, I'm not sure that the split of these patches is correct - there isn't any bisectability here as you remove the timer in this patch but picoxcell won't build. I think squashing these 2 patches is fine.
I can't test on hardware right now, but with those changes:
Jamie
PATCH v2 1/2 clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Quoted 31 lines · Jamie Iles
Hi,
Quoted 27 lines · dinguyen at altera.com
From: Dinh Nguyen <[email protected]>
Make a common device tree glue for clocksource/dw_apb_timer. Move
mach-picoxcell/time.cto be a generic device tree application of thedw_apb_timer.Signed-off-by Pavel Machek <[email protected]>Signed-off-by Dinh Nguyen <[email protected]>--- Documentation/devicetree/bindings/rtc/dw-apb.txt | 24 ++++++++++ arch/arm/Kconfig | 1 + drivers/clocksource/Kconfig | 3 ++ drivers/clocksource/Makefile | 1 + .../clocksource/dw_apb_timer_of.c | 49 +++++++++++--------- 5 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/dw-apb.txt rename arch/arm/mach-picoxcell/time.c => drivers/clocksource/dw_apb_timer_of.c (60%)drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +0
-0@@ -1,11 +1,20 @@[...]
Quoted 8 lines
drivers/clocksource/dw_apb_timer_of.c static void picoxcell_add_clocksource(struct device_node *source_timer) · line 84
Quoted 5 lines
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +2
-2-static const struct of_device_id picoxcell_rtc_ids[]__initconst = { - { .compatible ="picochip,pc3x2-rtc" }, +static const struct of_device_id sptimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-sp" }, {/* Sentinel */ },Please keep picochip,pc3x2-rtc in the compatible list otherwise we won't boot any more.
Should I add another .compatible entry here, or make the change in picoxcell-pc3x2 and picoxcell-pc3x3 dtsi files?
Quoted 13 lines
drivers/clocksource/dw_apb_timer_of.c static void picoxcell_add_clocksource(struct device_node *source_timer) · line 105
Quoted 8 lines
-static const struct
of_device_idpicoxcell_timer_ids[]__initconst= {drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +2
-1- { .compatible = "picochip,pc3x2-timer" }, +static const struct of_device_id osctimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-osc" }, {}, };The same here. Also, I'm not sure that the split of these patches is correct - there isn't any bisectability here as you remove the timer in this patch but picoxcell won't build. I think squashing these 2 patches is fine.
Will do...thanks for the review.
Dinh
Quoted 7 lines
I can't test on hardware right now, but with those changes:
Acked-by Jamie Iles <[email protected]>Jamie
PATCH v2 1/2 clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Quoted 15 lines · Dinh Nguyen
Quoted 5 lines · Jamie Iles
Quoted 3 lines · dinguyen at altera.com
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +0
-0@@ -1,11 +1,20 @@[...]
Quoted 8 lines
drivers/clocksource/dw_apb_timer_of.c static void picoxcell_add_clocksource(struct device_node *source_timer) · line 84
Quoted 5 lines
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +2
-2-static const struct of_device_id picoxcell_rtc_ids[]__initconst = { - { .compatible ="picochip,pc3x2-rtc" }, +static const struct of_device_id sptimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-sp" }, {/* Sentinel */ },Please keep picochip,pc3x2-rtc in the compatible list otherwise we won't boot any more.
Quoted 2 lines
Should I add another .compatible entry here, or make the change in picoxcell-pc3x2 and picoxcell-pc3x3 dtsi files?
I think that adding another compatible entry is the right thing to do here - it avoids churn of the dtsi files and means that the compiled device-tree blobs on deployed devices won't need updating.
Jamie
PATCH v2 1/2 clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Quoted 16 lines · Jamie Iles
Quoted 15 lines · Dinh Nguyen
Quoted 13 lines · Jamie Iles
Quoted 3 lines · dinguyen at altera.com
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +0
-0@@ -1,11 +1,20 @@[...]
drivers/clocksource/dw_apb_timer_of.c static void picoxcell_add_clocksource(struct device_node *source_timer) · line 84
Quoted 5 lines
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +2
-2-static const struct of_device_id picoxcell_rtc_ids[]__initconst = { - { .compatible ="picochip,pc3x2-rtc" }, +static const struct of_device_id sptimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-sp" }, {/* Sentinel */ },Please keep picochip,pc3x2-rtc in the compatible list otherwise we won't boot any more.
Quoted 6 lines
Quoted 2 lines
Should I add another .compatible entry here, or make the change in picoxcell-pc3x2 and picoxcell-pc3x3 dtsi files?
I think that adding another compatible entry is the right thing to do here - it avoids churn of the dtsi files and means that the compiled device-tree blobs on deployed devices won't need updating.
Rob requested making "-freq" -> "-frequency" change, which will make it incompatible.
Shall we:
a) drop all the compatibility
b) make it parse both "-freq" and "-freqency" and both sets of ids
?
Thanks,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH v2 1/2 clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Quoted 20 lines · Pavel Machek
Quoted 19 lines · Jamie Iles
Quoted 17 lines · Dinh Nguyen
Quoted 5 lines · Jamie Iles
Quoted 3 lines · dinguyen at altera.com
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +0
-0@@ -1,11 +1,20 @@[...]
Quoted 8 lines
drivers/clocksource/dw_apb_timer_of.c static void picoxcell_add_clocksource(struct device_node *source_timer) · line 84
Quoted 5 lines
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +2
-2-static const struct of_device_id picoxcell_rtc_ids[]__initconst = { - { .compatible ="picochip,pc3x2-rtc" }, +static const struct of_device_id sptimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-sp" }, {/* Sentinel */ },Please keep picochip,pc3x2-rtc in the compatible list otherwise we won't boot any more.
Should I add another .compatible entry here, or make the change in picoxcell-pc3x2 and picoxcell-pc3x3 dtsi files?
Quoted 7 lines
Quoted 3 lines
I think that adding another compatible entry is the right thing to do here - it avoids churn of the dtsi files and means that the compiled device-tree blobs on deployed devices won't need updating.
Rob requested making "-freq" -> "-frequency" change, which will make it incompatible.
I think everyone uses -frequency. Just realized that I need up send out a v4.
Because this is wrong:
if (of_property_read_u32(np, "clock-freq", rate))
Dinh
Quoted 10 lines
Shall we:
a) drop all the compatibility
b) make it parse both "-freq" and "-freqency" and both sets of ids
?
Thanks,
Pavel
Confidentiality Notice.
This message may contain information that is confidential or otherwise protected from disclosure. If you are not the intended recipient, you are hereby notified that any use, disclosure, dissemination, distribution, or copying of this message, or any attachments, is strictly prohibited. If you have received this message in error, please advise the sender by reply e-mail, and delete the message and any attachments. Thank you.
PATCH v2 1/2 clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
In reply to dinguyen at altera.comDinh,
Quoted 24 lines · dinguyen at altera.com
From: Dinh Nguyen <[email protected]>
Make a common device tree glue for clocksource/dw_apb_timer. Move
mach-picoxcell/time.cto be a generic device tree application of thedw_apb_timer.Signed-off-by Pavel Machek <[email protected]>Signed-off-by Dinh Nguyen <[email protected]>--- Documentation/devicetree/bindings/rtc/dw-apb.txt | 24 ++++++++++ arch/arm/Kconfig | 1 + drivers/clocksource/Kconfig | 3 ++ drivers/clocksource/Makefile | 1 + .../clocksource/dw_apb_timer_of.c | 49 +++++++++++--------- 5 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/dw-apb.txt rename arch/arm/mach-picoxcell/time.c => drivers/clocksource/dw_apb_timer_of.c (60%)Documentation/devicetree/bindings/rtc/dw-apb.txt new file +0
-0
Documentation/devicetree/bindings/rtc/dw-apb.txt line 8
Quoted 8 lines
Documentation/devicetree/bindings/rtc/dw-apb.txt new file +8
-0@@ -0,0 +1,24 @@ +* Designware APB timer + +Required properties: +- compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc" +- reg: physical base address of the controller and length of memory mapped + region. +- interrupts: IRQ line for the timer. +- clock-freq: The frequency in HZ of the timer.
clock-frequency is the standard name here.
Rob
Quoted 182 lines
Documentation/devicetree/bindings/rtc/dw-apb.txt new file +16
-0+ +Example: + + timer1: timer at ffc09000 { + compatible = "snps,dw-apb-timer-sp"; + interrupts = <0 168 4>; + clock-freq = <200000000>; + reg = <0xffc09000 0x1000>; + }; + + timer2: timer at ffd00000 { + compatible = "snps,dw-apb-timer-osc"; + interrupts = <0 169 4>; + clock-freq = <200000000>; + reg = <0xffd00000 0x1000>; + };arch/arm/Kconfig +1
-0@@ -658,6 +658,7 @@ config ARCH_PICOXCELL select ARM_VIC select CPU_V6K select DW_APB_TIMER + select DW_APB_TIMER_OF select GENERIC_CLOCKEVENTS select GENERIC_GPIO select HAVE_TCMdrivers/clocksource/Kconfig +3
-0@@ -15,6 +15,9 @@ config CLKSRC_MMIO config DW_APB_TIMER bool + +config DW_APB_TIMER_OF + bool config CLKSRC_DBX500_PRCMU bool "Clocksource PRCMU Timer"drivers/clocksource/Makefile +1
-0@@ -10,4 +10,5 @@ obj-$(CONFIG_EM_TIMER_STI) += em_sti.o obj-$(CONFIG_CLKBLD_I8253) += i8253.o obj-$(CONFIG_CLKSRC_MMIO) += mmio.o obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o +obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.odrivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +28
-21@@ -1,11 +1,20 @@/* +* Copyright (C) 2012 Altera Corporation * Copyright (c) 2011 Picochip Ltd., Jamie Iles * +* Modified from mach-picoxcell/time.c +* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * -* All enquiries to support at picochip.com +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/dw_apb_timer.h> #include <linux/of.h> @@ -15,8 +24,6 @@#include <asm/mach/time.h> #include <asm/sched_clock.h> -#include "common.h" -static void timer_get_base_and_rate (struct device_node *np,void __iomem **base,u32 *rate) {@@ -29,7 +36,7 @@ static void timer_get_base_and_rate(struct device_node *np,panic ("No clock-freq property for %s" , np->name); } -static void picoxcell_add_clockevent (struct device_node *event_timer) +static void add_clockevent (struct device_node *event_timer) {void __iomem *iobase;struct dw_apb_clock_event_device *ced;@@ -49,7 +56,7 @@ static void picoxcell_add_clockevent(struct device_node *event_timer)dw_apb_clockevent_register (ced); } -static void picoxcell_add_clocksource (struct device_node *source_timer) +static void add_clocksource (struct device_node *source_timer) {void __iomem *iobase;struct dw_apb_clocksource *cs;@@ -67,55 +74,55 @@ static void picoxcell_add_clocksource(struct device_node *source_timer)static void __iomem *sched_io_base; -static u32 picoxcell_read_sched_clock (void ) +static u32 read_sched_clock (void ) {return __raw_readl (sched_io_base); } -static const struct of_device_id picoxcell_rtc_ids[]__initconst = { - { .compatible ="picochip,pc3x2-rtc" }, +static const struct of_device_id sptimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-sp" }, {/* Sentinel */ }, }; -static void picoxcell_init_sched_clock (void ) +static void init_sched_clock (void ) {struct device_node *sched_timer;u32 rate; - sched_timer =of_find_matching_node (NULL , picoxcell_rtc_ids); + sched_timer =of_find_matching_node (NULL , sptimer_ids);if (!sched_timer)panic ("No RTC for sched clock to use" );timer_get_base_and_rate (sched_timer, &sched_io_base, &rate);of_node_put (sched_timer); -setup_sched_clock (picoxcell_read_sched_clock,32 , rate); +setup_sched_clock (read_sched_clock,32 , rate); } -static const struct of_device_id picoxcell_timer_ids[]__initconst = { - { .compatible ="picochip,pc3x2-timer" }, +static const struct of_device_id osctimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-osc" }, {}, }; -static void __init picoxcell_timer_init (void ) +static void __init timer_init (void ) {struct device_node *event_timer, *source_timer; - event_timer =of_find_matching_node (NULL , picoxcell_timer_ids); + event_timer =of_find_matching_node (NULL , osctimer_ids);if (!event_timer)panic ("No timer for clockevent" ); -picoxcell_add_clockevent (event_timer); +add_clockevent (event_timer); - source_timer =of_find_matching_node (event_timer, picoxcell_timer_ids); + source_timer =of_find_matching_node (event_timer, osctimer_ids);if (!source_timer)panic ("No timer for clocksource" ); -picoxcell_add_clocksource (source_timer); +add_clocksource (source_timer);of_node_put (source_timer); -picoxcell_init_sched_clock (); +init_sched_clock (); } -struct sys_timer picoxcell_timer = { - .init = picoxcell_timer_init, +struct sys_timer dw_apb_timer = { + .init = timer_init, };
PATCH v2 1/2 clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer
Quoted 21 lines · Rob Herring
Dinh,
Quoted 18 lines · dinguyen at altera.com
From: Dinh Nguyen <[email protected]>
Make a common device tree glue for clocksource/dw_apb_timer. Move
mach-picoxcell/time.cto be a generic device tree application of thedw_apb_timer.Signed-off-by Pavel Machek <[email protected]>Signed-off-by Dinh Nguyen <[email protected]>--- Documentation/devicetree/bindings/rtc/dw-apb.txt | 24 ++++++++++ arch/arm/Kconfig | 1 + drivers/clocksource/Kconfig | 3 ++ drivers/clocksource/Makefile | 1 + .../clocksource/dw_apb_timer_of.c | 49 +++++++++++--------- 5 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/dw-apb.txt rename arch/arm/mach-picoxcell/time.c => drivers/clocksource/dw_apb_timer_of.c (60%)
Quoted 16 lines
Quoted 6 lines
Documentation/devicetree/bindings/rtc/dw-apb.txt new file +0
-0Documentation/devicetree/bindings/rtc/dw-apb.txt line 8
Quoted 8 lines
Documentation/devicetree/bindings/rtc/dw-apb.txt new file +8
-0@@ -0,0 +1,24 @@ +* Designware APB timer + +Required properties: +- compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc" +- reg: physical base address of the controller and length of memory mapped + region. +- interrupts: IRQ line for the timer. +- clock-freq: The frequency in HZ of the timer.clock-frequency is the standard name here.
Thanks for the review Rob!
Dinh
Quoted 179 lines
Rob
Quoted 176 lines
Documentation/devicetree/bindings/rtc/dw-apb.txt new file +16
-0+ +Example: + + timer1: timer at ffc09000 { + compatible = "snps,dw-apb-timer-sp"; + interrupts = <0 168 4>; + clock-freq = <200000000>; + reg = <0xffc09000 0x1000>; + }; + + timer2: timer at ffd00000 { + compatible = "snps,dw-apb-timer-osc"; + interrupts = <0 169 4>; + clock-freq = <200000000>; + reg = <0xffd00000 0x1000>; + };arch/arm/Kconfig +1
-0@@ -658,6 +658,7 @@ config ARCH_PICOXCELL select ARM_VIC select CPU_V6K select DW_APB_TIMER + select DW_APB_TIMER_OF select GENERIC_CLOCKEVENTS select GENERIC_GPIO select HAVE_TCMdrivers/clocksource/Kconfig +3
-0@@ -15,6 +15,9 @@ config CLKSRC_MMIO config DW_APB_TIMER bool + +config DW_APB_TIMER_OF + bool config CLKSRC_DBX500_PRCMU bool "Clocksource PRCMU Timer"drivers/clocksource/Makefile +1
-0@@ -10,4 +10,5 @@ obj-$(CONFIG_EM_TIMER_STI) += em_sti.o obj-$(CONFIG_CLKBLD_I8253) += i8253.o obj-$(CONFIG_CLKSRC_MMIO) += mmio.o obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o +obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.odrivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +26
-19@@ -1,11 +1,20 @@/* +* Copyright (C) 2012 Altera Corporation * Copyright (c) 2011 Picochip Ltd., Jamie Iles * +* Modified from mach-picoxcell/time.c +* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. * -* All enquiries to support at picochip.com +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/dw_apb_timer.h> #include <linux/of.h> @@ -15,8 +24,6 @@#include <asm/mach/time.h> #include <asm/sched_clock.h> -#include "common.h" -static void timer_get_base_and_rate (struct device_node *np,void __iomem **base,u32 *rate) {@@ -29,7 +36,7 @@ static void timer_get_base_and_rate(struct device_node *np,panic ("No clock-freq property for %s" , np->name); } -static void picoxcell_add_clockevent (struct device_node *event_timer) +static void add_clockevent (struct device_node *event_timer) {void __iomem *iobase;struct dw_apb_clock_event_device *ced;@@ -49,7 +56,7 @@ static void picoxcell_add_clockevent(struct device_node *event_timer)dw_apb_clockevent_register (ced); } -static void picoxcell_add_clocksource (struct device_node *source_timer) +static void add_clocksource (struct device_node *source_timer) {void __iomem *iobase;struct dw_apb_clocksource *cs;@@ -67,55 +74,55 @@ static void picoxcell_add_clocksource(struct device_node *source_timer)static void __iomem *sched_io_base; -static u32 picoxcell_read_sched_clock (void ) +static u32 read_sched_clock (void ) {return __raw_readl (sched_io_base); } -static const struct of_device_id picoxcell_rtc_ids[]__initconst = { - { .compatible ="picochip,pc3x2-rtc" }, +static const struct of_device_id sptimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-sp" }, {/* Sentinel */ }, }; -static void picoxcell_init_sched_clock (void ) +static void init_sched_clock (void ) {struct device_node *sched_timer;u32 rate; - sched_timer =of_find_matching_node (NULL , picoxcell_rtc_ids); + sched_timer =of_find_matching_node (NULL , sptimer_ids);if (!sched_timer)panic ("No RTC for sched clock to use" );timer_get_base_and_rate (sched_timer, &sched_io_base, &rate);of_node_put (sched_timer); -setup_sched_clock (picoxcell_read_sched_clock,32 , rate); +setup_sched_clock (read_sched_clock,32 , rate); } -static const struct of_device_id picoxcell_timer_ids[]__initconst = { - { .compatible ="picochip,pc3x2-timer" }, +static const struct of_device_id osctimer_ids[]__initconst = { + { .compatible ="snps,dw-apb-timer-osc" }, {}, }; -static void __init picoxcell_timer_init (void ) +static void __init timer_init (void ) {struct device_node *event_timer, *source_timer; - event_timer =of_find_matching_node (NULL , picoxcell_timer_ids); + event_timer =of_find_matching_node (NULL , osctimer_ids);if (!event_timer)panic ("No timer for clockevent" ); -picoxcell_add_clockevent (event_timer); +add_clockevent (event_timer); - source_timer =of_find_matching_node (event_timer, picoxcell_timer_ids); + source_timer =of_find_matching_node (event_timer, osctimer_ids);if (!source_timer)panic ("No timer for clocksource" ); -picoxcell_add_clocksource (source_timer); +add_clocksource (source_timer);of_node_put (source_timer); -picoxcell_init_sched_clock (); +init_sched_clock (); }
Quoted 9 lines
drivers/clocksource/dw_apb_timer_of.c static void picoxcell_add_clocksource(struct device_node *source_timer) · line 128
Quoted 6 lines
drivers/clocksource/dw_apb_timer_of.c renamed from arch/arm/mach-picoxcell/time.c +2
-2-struct sys_timer picoxcell_timer = { - .init = picoxcell_timer_init, +struct sys_timer dw_apb_timer = { + .init = timer_init, };
Confidentiality Notice.
This message may contain information that is confidential or otherwise protected from disclosure. If you are not the intended recipient, you are hereby notified that any use, disclosure, dissemination, distribution, or copying of this message, or any attachments, is strictly prohibited. If you have received this message in error, please advise the sender by reply e-mail, and delete the message and any attachments. Thank you.