diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-01 12:24:18 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-10 17:30:19 -0500 |
commit | 34adeda943e1fb10e8de022b834996e04241fa7d (patch) | |
tree | 49a56f3f8531393536adec48e3115a14827c8ccf /arch | |
parent | b44c350d4104265cf3a6b4355dc1ee05c16aa5de (diff) |
ARM: restart: add default restart modes for PXA mioa701, spitz and tosa
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/tosa.c | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index b938fc2c316a..4f47a760398f 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -752,6 +752,7 @@ static void mioa701_machine_exit(void) | |||
752 | 752 | ||
753 | MACHINE_START(MIOA701, "MIO A701") | 753 | MACHINE_START(MIOA701, "MIO A701") |
754 | .atag_offset = 0x100, | 754 | .atag_offset = 0x100, |
755 | .restart_mode = 's', | ||
755 | .map_io = &pxa27x_map_io, | 756 | .map_io = &pxa27x_map_io, |
756 | .init_irq = &pxa27x_init_irq, | 757 | .init_irq = &pxa27x_init_irq, |
757 | .handle_irq = &pxa27x_handle_irq, | 758 | .handle_irq = &pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 953a9195f9e5..2f57d94de727 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -982,6 +982,7 @@ static void __init spitz_fixup(struct tag *tags, char **cmdline, | |||
982 | 982 | ||
983 | #ifdef CONFIG_MACH_SPITZ | 983 | #ifdef CONFIG_MACH_SPITZ |
984 | MACHINE_START(SPITZ, "SHARP Spitz") | 984 | MACHINE_START(SPITZ, "SHARP Spitz") |
985 | .restart_mode = 'g', | ||
985 | .fixup = spitz_fixup, | 986 | .fixup = spitz_fixup, |
986 | .map_io = pxa27x_map_io, | 987 | .map_io = pxa27x_map_io, |
987 | .init_irq = pxa27x_init_irq, | 988 | .init_irq = pxa27x_init_irq, |
@@ -993,6 +994,7 @@ MACHINE_END | |||
993 | 994 | ||
994 | #ifdef CONFIG_MACH_BORZOI | 995 | #ifdef CONFIG_MACH_BORZOI |
995 | MACHINE_START(BORZOI, "SHARP Borzoi") | 996 | MACHINE_START(BORZOI, "SHARP Borzoi") |
997 | .restart_mode = 'g', | ||
996 | .fixup = spitz_fixup, | 998 | .fixup = spitz_fixup, |
997 | .map_io = pxa27x_map_io, | 999 | .map_io = pxa27x_map_io, |
998 | .init_irq = pxa27x_init_irq, | 1000 | .init_irq = pxa27x_init_irq, |
@@ -1004,6 +1006,7 @@ MACHINE_END | |||
1004 | 1006 | ||
1005 | #ifdef CONFIG_MACH_AKITA | 1007 | #ifdef CONFIG_MACH_AKITA |
1006 | MACHINE_START(AKITA, "SHARP Akita") | 1008 | MACHINE_START(AKITA, "SHARP Akita") |
1009 | .restart_mode = 'g', | ||
1007 | .fixup = spitz_fixup, | 1010 | .fixup = spitz_fixup, |
1008 | .map_io = pxa27x_map_io, | 1011 | .map_io = pxa27x_map_io, |
1009 | .init_irq = pxa27x_init_irq, | 1012 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 402b0c96613b..ef6453041cf1 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -970,6 +970,7 @@ static void __init fixup_tosa(struct tag *tags, char **cmdline, | |||
970 | } | 970 | } |
971 | 971 | ||
972 | MACHINE_START(TOSA, "SHARP Tosa") | 972 | MACHINE_START(TOSA, "SHARP Tosa") |
973 | .restart_mode = 'g', | ||
973 | .fixup = fixup_tosa, | 974 | .fixup = fixup_tosa, |
974 | .map_io = pxa25x_map_io, | 975 | .map_io = pxa25x_map_io, |
975 | .nr_irqs = TOSA_NR_IRQS, | 976 | .nr_irqs = TOSA_NR_IRQS, |