diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-09-19 14:02:31 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-11-16 14:22:16 -0500 |
commit | 2f2b7fb202a2fa93702a79d36033e5c8bee0120d (patch) | |
tree | 22d29b27f152fc0b9a87f1d80ff57dcbaa65b59d /arch | |
parent | 9a2ab3f1fa01a146a395197153af0ae586e6a682 (diff) |
ARM: tegra: define DT bindings for and instantiate timer
The Tegra timer provides a number of 29-bit timer channels, a single
32-bit free running counter, and in the Tegra30 variant, 5 watchdog modules.
The first two channels may also trigger a legacy watchdog reset.
Define a DT binding for this HW module, and add the module into the Tegra
device tree files.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 11 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index fba998e3954a..96c922d8bb39 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
@@ -108,6 +108,15 @@ | |||
108 | #interrupt-cells = <3>; | 108 | #interrupt-cells = <3>; |
109 | }; | 109 | }; |
110 | 110 | ||
111 | timer@60005000 { | ||
112 | compatible = "nvidia,tegra20-timer"; | ||
113 | reg = <0x60005000 0x60>; | ||
114 | interrupts = <0 0 0x04 | ||
115 | 0 1 0x04 | ||
116 | 0 41 0x04 | ||
117 | 0 42 0x04>; | ||
118 | }; | ||
119 | |||
111 | apbdma: dma { | 120 | apbdma: dma { |
112 | compatible = "nvidia,tegra20-apbdma"; | 121 | compatible = "nvidia,tegra20-apbdma"; |
113 | reg = <0x6000a000 0x1200>; | 122 | reg = <0x6000a000 0x1200>; |
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 1f7f49aabe6b..48a8320ebf03 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi | |||
@@ -108,6 +108,17 @@ | |||
108 | #interrupt-cells = <3>; | 108 | #interrupt-cells = <3>; |
109 | }; | 109 | }; |
110 | 110 | ||
111 | timer@60005000 { | ||
112 | compatible = "nvidia,tegra30-timer", "nvidia,tegra20-timer"; | ||
113 | reg = <0x60005000 0x400>; | ||
114 | interrupts = <0 0 0x04 | ||
115 | 0 1 0x04 | ||
116 | 0 41 0x04 | ||
117 | 0 42 0x04 | ||
118 | 0 121 0x04 | ||
119 | 0 122 0x04>; | ||
120 | }; | ||
121 | |||
111 | apbdma: dma { | 122 | apbdma: dma { |
112 | compatible = "nvidia,tegra30-apbdma", "nvidia,tegra20-apbdma"; | 123 | compatible = "nvidia,tegra30-apbdma", "nvidia,tegra20-apbdma"; |
113 | reg = <0x6000a000 0x1400>; | 124 | reg = <0x6000a000 0x1400>; |