Skip to content

Commit

Permalink
ARM: restart: add default restart modes for PXA mioa701, spitz and tosa
Browse files Browse the repository at this point in the history
Add a default restart mode to reflect the hard-coded restart mode
found in these files.

Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Nov 10, 2011
1 parent b44c350 commit 34adeda
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-pxa/mioa701.c
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,7 @@ static void mioa701_machine_exit(void)

MACHINE_START(MIOA701, "MIO A701")
.atag_offset = 0x100,
.restart_mode = 's',
.map_io = &pxa27x_map_io,
.init_irq = &pxa27x_init_irq,
.handle_irq = &pxa27x_handle_irq,
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/mach-pxa/spitz.c
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ static void __init spitz_fixup(struct tag *tags, char **cmdline,

#ifdef CONFIG_MACH_SPITZ
MACHINE_START(SPITZ, "SHARP Spitz")
.restart_mode = 'g',
.fixup = spitz_fixup,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
Expand All @@ -993,6 +994,7 @@ MACHINE_END

#ifdef CONFIG_MACH_BORZOI
MACHINE_START(BORZOI, "SHARP Borzoi")
.restart_mode = 'g',
.fixup = spitz_fixup,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
Expand All @@ -1004,6 +1006,7 @@ MACHINE_END

#ifdef CONFIG_MACH_AKITA
MACHINE_START(AKITA, "SHARP Akita")
.restart_mode = 'g',
.fixup = spitz_fixup,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-pxa/tosa.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,7 @@ static void __init fixup_tosa(struct tag *tags, char **cmdline,
}

MACHINE_START(TOSA, "SHARP Tosa")
.restart_mode = 'g',
.fixup = fixup_tosa,
.map_io = pxa25x_map_io,
.nr_irqs = TOSA_NR_IRQS,
Expand Down

0 comments on commit 34adeda

Please sign in to comment.