2012-10-16 10:10:25

by Sivaram Nair

Subject: [PATCH 0/2] ARM: tegra: bring back tegra_timer clock

This patchset fixes a bug introduced by commit
20f4665831cec65d6e5d33587bba28ffa536b91d by bringing back the
tegra_timer clock. The above commit caused tegra_init_timer() failing
to get the clk reference.

The first patch renames the existing tegra_timer object to
tegra_sys_timer and the second patch adds previously-removed tegra_timer
clock object.

Sivaram Nair (2):
ARM: tegra: rename tegra system timer
ARM: tegra: add tegra_timer clock

arch/arm/mach-tegra/board-dt-tegra20.c | 2 +-
arch/arm/mach-tegra/board-dt-tegra30.c | 2 +-
arch/arm/mach-tegra/board.h | 2 +-
arch/arm/mach-tegra/tegra20_clocks_data.c | 1 +
arch/arm/mach-tegra/tegra30_clocks_data.c | 1 +
arch/arm/mach-tegra/timer.c | 2 +-
6 files changed, 6 insertions(+), 4 deletions(-)

2012-10-16 10:10:27

by Sivaram Nair

Subject: [PATCH 1/2] ARM: tegra: rename tegra system timer

From: Sivaram Nair <[email protected]>

The timer variable is renamed to avoid confusion and symbol name clash
with the tegra_timer clock.

Signed-off-by: Sivaram Nair <[email protected]>
---
arch/arm/mach-tegra/board-dt-tegra20.c | 2 +-
arch/arm/mach-tegra/board-dt-tegra30.c | 2 +-
arch/arm/mach-tegra/board.h | 2 +-
arch/arm/mach-tegra/timer.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c
index 57e235f..aa5325c 100644
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -182,7 +182,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")
.init_early = tegra20_init_early,
.init_irq = tegra_dt_init_irq,
.handle_irq = gic_handle_irq,
- .timer = &tegra_timer,
+ .timer = &tegra_sys_timer,
.init_machine = tegra_dt_init,
.init_late = tegra_dt_init_late,
.restart = tegra_assert_system_reset,
diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c
index e4a676d..5e92a81 100644
--- a/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@ -89,7 +89,7 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)")
.init_early = tegra30_init_early,
.init_irq = tegra_dt_init_irq,
.handle_irq = gic_handle_irq,
- .timer = &tegra_timer,
+ .timer = &tegra_sys_timer,
.init_machine = tegra30_dt_init,
.init_late = tegra_init_late,
.restart = tegra_assert_system_reset,
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index f88e514..91fbe73 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -55,5 +55,5 @@ static inline int harmony_pcie_init(void) { return 0; }

void __init tegra_paz00_wifikill_init(void);

-extern struct sys_timer tegra_timer;
+extern struct sys_timer tegra_sys_timer;
#endif
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index eccdce9..d3b8c8e 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -245,7 +245,7 @@ static void __init tegra_init_timer(void)
register_persistent_clock(NULL, tegra_read_persistent_clock);
}

-struct sys_timer tegra_timer = {
+struct sys_timer tegra_sys_timer = {
.init = tegra_init_timer,
};

--
1.7.0.4

2012-10-16 10:10:29

by Sivaram Nair

Subject: [PATCH 2/2] ARM: tegra: add tegra_timer clock

From: Sivaram Nair <[email protected]>

This undoes commit 20f4665831cec65d6e5d33587bba28ffa536b91d 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 <[email protected]>
---
arch/arm/mach-tegra/tegra20_clocks_data.c | 1 +
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 cc9b5fd..8d398a3 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 d92cb55..3d2e553 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,
--
1.7.0.4

2012-10-16 17:30:12

by Stephen Warren

Subject: Re: [PATCH 0/2] ARM: tegra: bring back tegra_timer clock

On 10/16/2012 04:08 AM, Sivaram Nair wrote:
> This patchset fixes a bug introduced by commit
> 20f4665831cec65d6e5d33587bba28ffa536b91d by bringing back the
> tegra_timer clock. The above commit caused tegra_init_timer() failing
> to get the clk reference.
>
> The first patch renames the existing tegra_timer object to
> tegra_sys_timer and the second patch adds previously-removed tegra_timer
> clock object.

Thanks. The series applied to Tegra's for-3.7/fixes-for-rc2 branch.
Sorry for the regression.