lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: restart: tegra: use new restart hook

Browse Source 
Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-11-05 08:48:33 +00:00
parent dd1661e27a
commit abea3f2ce0
7 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-tegra/board-dt.c
View File

@@ -132,5 +132,6 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")
.init_irq = tegra_init_irq, .init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_dt_init, .init_machine = tegra_dt_init,
.restart = tegra_assert_system_reset,
.dt_compat = tegra_dt_board_compat, .dt_compat = tegra_dt_board_compat,
MACHINE_END MACHINE_END

1
arch/arm/mach-tegra/board-harmony.c
View File

@@ -189,4 +189,5 @@ MACHINE_START(HARMONY, "harmony")
.init_irq = tegra_init_irq, .init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_harmony_init, .init_machine = tegra_harmony_init,
.restart = tegra_assert_system_reset,
MACHINE_END MACHINE_END

1
arch/arm/mach-tegra/board-paz00.c
View File

@@ -192,4 +192,5 @@ MACHINE_START(PAZ00, "Toshiba AC100 / Dynabook AZ")
.init_irq = tegra_init_irq, .init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_paz00_init, .init_machine = tegra_paz00_init,
.restart = tegra_assert_system_reset,
MACHINE_END MACHINE_END

3
arch/arm/mach-tegra/board-seaboard.c
View File

@@ -286,6 +286,7 @@ MACHINE_START(SEABOARD, "seaboard")
.init_irq = tegra_init_irq, .init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_seaboard_init, .init_machine = tegra_seaboard_init,
.restart = tegra_assert_system_reset,
MACHINE_END MACHINE_END
MACHINE_START(KAEN, "kaen") MACHINE_START(KAEN, "kaen")
@@ -295,6 +296,7 @@ MACHINE_START(KAEN, "kaen")
.init_irq = tegra_init_irq, .init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_kaen_init, .init_machine = tegra_kaen_init,
.restart = tegra_assert_system_reset,
MACHINE_END MACHINE_END
MACHINE_START(WARIO, "wario") MACHINE_START(WARIO, "wario")
@@ -304,4 +306,5 @@ MACHINE_START(WARIO, "wario")
.init_irq = tegra_init_irq, .init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_wario_init, .init_machine = tegra_wario_init,
.restart = tegra_assert_system_reset,
MACHINE_END MACHINE_END

1
arch/arm/mach-tegra/board-trimslice.c
View File

@@ -178,4 +178,5 @@ MACHINE_START(TRIMSLICE, "trimslice")
.init_irq = tegra_init_irq, .init_irq = tegra_init_irq,
.timer = &tegra_timer, .timer = &tegra_timer,
.init_machine = tegra_trimslice_init, .init_machine = tegra_trimslice_init,
.restart = tegra_assert_system_reset,
MACHINE_END MACHINE_END

2
arch/arm/mach-tegra/common.c
View File

@@ -31,8 +31,6 @@
#include "clock.h" #include "clock.h"
#include "fuse.h" #include "fuse.h"
void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;
void tegra_assert_system_reset(char mode, const char *cmd) void tegra_assert_system_reset(char mode, const char *cmd)
{ {
void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04); void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);

6
arch/arm/mach-tegra/include/mach/system.h
View File

@@ -21,9 +21,9 @@
#ifndef __MACH_TEGRA_SYSTEM_H #ifndef __MACH_TEGRA_SYSTEM_H
#define __MACH_TEGRA_SYSTEM_H #define __MACH_TEGRA_SYSTEM_H
#include <mach/iomap.h> static inline void arch_reset(char mode, const char *cmd)
{
extern void (*arch_reset)(char mode, const char *cmd); }
static inline void arch_idle(void) static inline void arch_idle(void)
{ {