diff options
| author | Sivaram Nair | 2012-10-16 12:08:36 +0200 |
|---|---|---|
| committer | Stephen Warren | 2012-10-16 19:15:05 +0200 |
| commit | bf88ef883585ebc1a6c2369483833ed11ca7666c (patch) | |
| tree | e82f5a69cdc31f4785b1bf2b6039f6f6cdab5412 /arch/arm | |
| parent | ARM: tegra: rename tegra system timer (diff) | |
| download | kernel-qcow2-linux-bf88ef883585ebc1a6c2369483833ed11ca7666c.tar.gz kernel-qcow2-linux-bf88ef883585ebc1a6c2369483833ed11ca7666c.tar.xz kernel-qcow2-linux-bf88ef883585ebc1a6c2369483833ed11ca7666c.zip | |
ARM: tegra: add tegra_timer clock
This undoes commit 20f4665 "ARM: tegra: remove tegra_timer from
tegra_list_clks" by bringing back the tegra_timer clock. tegra_timer is
indeed a clock (hidden by the PERIPH_CLK macro) which should be added
to the tegra_list_clks.
The above commit caused tegra_init_timer() failing to get the clk
reference.
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
[swarren: added the reverted commit's subject to this patch description]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/tegra20_clocks_data.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra30_clocks_data.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra20_clocks_data.c b/arch/arm/mach-tegra/tegra20_clocks_data.c index cc9b5fd8c3d3..8d398a33adf7 100644 --- a/arch/arm/mach-tegra/tegra20_clocks_data.c +++ b/arch/arm/mach-tegra/tegra20_clocks_data.c @@ -953,6 +953,7 @@ PERIPH_CLK(pcie_xclk, NULL, "pcie_xclk", 74, 0, 26000000, mux_clk_m, static struct clk *tegra_list_clks[] = { &tegra_apbdma, &tegra_rtc, + &tegra_timer, &tegra_i2s1, &tegra_i2s2, &tegra_spdif_out, diff --git a/arch/arm/mach-tegra/tegra30_clocks_data.c b/arch/arm/mach-tegra/tegra30_clocks_data.c index d92cb556ae35..3d2e5532a9ea 100644 --- a/arch/arm/mach-tegra/tegra30_clocks_data.c +++ b/arch/arm/mach-tegra/tegra30_clocks_data.c @@ -1143,6 +1143,7 @@ struct clk *tegra_list_clks[] = { &tegra_apbdma, &tegra_rtc, &tegra_kbc, + &tegra_timer, &tegra_kfuse, &tegra_fuse, &tegra_fuse_burn, |