diff options
author | Christian Daudt <csd@broadcom.com> | 2013-03-13 17:27:28 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-02 20:28:55 -0400 |
commit | 5f03dc2002f5dc85ce87e69caff7f28f17f5c9b2 (patch) | |
tree | 2fada9e1e50035adbde9b1cbe31ab331c3ca874f | |
parent | 33fe1e0ea97090dd3ab96e1bad3ef54f77509f95 (diff) |
ARM: bcm281xx: Add timer driver (DT portion)
This adds support for the Broadcom timer, used in the following SoCs:
BCM11130, BCM11140, BCM11351, BCM28145, BCM28155
Updates from V6:
- Split DT portion into a separate patch
Updates from V5:
- Rebase to latest arm-soc/for-next
Updates from V4:
- Switch code to use CLOCKSOURCE_OF_DECLARE
Updates from V3:
- Migrate to 3.9 timer framework updates
Updates from V2:
- prepend static fns + fields with kona_
Updates from V1:
- Rename bcm_timer.c to bcm_kona_timer.c
- Pull .h into bcm_kona_timer.c
- Make timers static
- Clean up comment block
- Switched to using clockevents_config_and_register
- Added an error to the get_timer loop if it repeats too much
- Added to Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt
- Added missing readl to timer_disable_and_clear
Note: bcm,kona-timer was kept as the 'compatible' field to make it
specific enough for when there are multiple bcm timers (bcm,timer is
too generic).
Signed-off-by: Christian Daudt <csd@broadcom.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: John Stultz <john.stultz@linaro.org>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt | 19 | ||||
-rw-r--r-- | arch/arm/boot/dts/bcm11351.dtsi | 8 |
2 files changed, 27 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt new file mode 100644 index 000000000000..59fa6e68d4f6 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/bcm/bcm,kona-timer.txt | |||
@@ -0,0 +1,19 @@ | |||
1 | Broadcom Kona Family timer | ||
2 | ----------------------------------------------------- | ||
3 | This timer is used in the following Broadcom SoCs: | ||
4 | BCM11130, BCM11140, BCM11351, BCM28145, BCM28155 | ||
5 | |||
6 | Required properties: | ||
7 | - compatible : "bcm,kona-timer" | ||
8 | - reg : Register range for the timer | ||
9 | - interrupts : interrupt for the timer | ||
10 | - clock-frequency: frequency that the clock operates | ||
11 | |||
12 | Example: | ||
13 | timer@35006000 { | ||
14 | compatible = "bcm,kona-timer"; | ||
15 | reg = <0x35006000 0x1000>; | ||
16 | interrupts = <0x0 7 0x4>; | ||
17 | clock-frequency = <32768>; | ||
18 | }; | ||
19 | |||
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi index ad135885bd2a..8f71f40722b9 100644 --- a/arch/arm/boot/dts/bcm11351.dtsi +++ b/arch/arm/boot/dts/bcm11351.dtsi | |||
@@ -47,4 +47,12 @@ | |||
47 | cache-unified; | 47 | cache-unified; |
48 | cache-level = <2>; | 48 | cache-level = <2>; |
49 | }; | 49 | }; |
50 | |||
51 | timer@35006000 { | ||
52 | compatible = "bcm,kona-timer"; | ||
53 | reg = <0x35006000 0x1000>; | ||
54 | interrupts = <0x0 7 0x4>; | ||
55 | clock-frequency = <32768>; | ||
56 | }; | ||
57 | |||
50 | }; | 58 | }; |