ARM: tegra: delete struct sys_timer
Dan Willemsen [Mon, 22 Jul 2013 01:19:27 +0000 (18:19 -0700)]
Make changes necessary for upstream v3.9 commit:

 commit 6bb27d7349db51b50c40534710fe164ca0d58902
 ARM: delete struct sys_timer

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

arch/arm/mach-tegra/board-curacao.c
arch/arm/mach-tegra/board-dalmore.c
arch/arm/mach-tegra/board-dt-tegra148.c
arch/arm/mach-tegra/board-macallan.c
arch/arm/mach-tegra/board-pismo.c
arch/arm/mach-tegra/board-pluto.c
arch/arm/mach-tegra/board-roth.c

index 4975e25..4390c63 100644 (file)
@@ -610,7 +610,7 @@ MACHINE_START(CURACAO, CURACAO_BOARD_NAME)
        .init_early     = tegra11x_init_early,
        .init_irq       = tegra_dt_init_irq,
        .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_curacao_dt_init,
        .dt_compat      = curacao_dt_board_compat,
 MACHINE_END
index 334bd66..3dfcd4b 100644 (file)
@@ -828,7 +828,7 @@ MACHINE_START(DALMORE, "dalmore")
        .init_early     = tegra11x_init_early,
        .init_irq       = tegra_dt_init_irq,
        .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_dalmore_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = dalmore_dt_board_compat,
index 51e2724..f4220b8 100644 (file)
@@ -41,7 +41,7 @@ DT_MACHINE_START(TEGRA148_DT, "NVIDIA Tegra148 (Flattened Device Tree)")
        .init_early     = tegra14x_init_early,
        .init_irq       = tegra_dt_init_irq,
        .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra148_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = tegra148_dt_board_compat,
index 68ca5f1..a1551dd 100644 (file)
@@ -765,7 +765,7 @@ MACHINE_START(MACALLAN, "macallan")
        .init_early     = tegra11x_init_early,
        .init_irq       = tegra_dt_init_irq,
        .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_macallan_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = macallan_dt_board_compat,
index 5c7f88b..17d169d 100644 (file)
@@ -804,7 +804,7 @@ MACHINE_START(PISMO, "pismo")
        .init_early     = tegra11x_init_early,
        .init_irq       = tegra_dt_init_irq,
        .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_pismo_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = pismo_dt_board_compat,
index 586a983..ddc7a85 100644 (file)
@@ -1417,7 +1417,7 @@ MACHINE_START(TEGRA_PLUTO, "tegra_pluto")
        .init_early     = tegra11x_init_early,
        .init_irq       = tegra_dt_init_irq,
        .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_pluto_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = pluto_dt_board_compat,
index 8e0ca88..74d9349 100644 (file)
@@ -791,7 +791,7 @@ MACHINE_START(ROTH, "roth")
        .init_early     = tegra11x_init_early,
        .init_irq       = tegra_dt_init_irq,
        .handle_irq     = gic_handle_irq,
-       .timer          = &tegra_sys_timer,
+       .init_time      = tegra_init_timer,
        .init_machine   = tegra_roth_dt_init,
        .restart        = tegra_assert_system_reset,
        .dt_compat      = roth_dt_board_compat,