diff options
Diffstat (limited to 'arch/mips/ar7/setup.c')
-rw-r--r-- | arch/mips/ar7/setup.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c index 39f6b5b96463..3a801d2cb6e5 100644 --- a/arch/mips/ar7/setup.c +++ b/arch/mips/ar7/setup.c | |||
@@ -26,8 +26,8 @@ | |||
26 | 26 | ||
27 | static void ar7_machine_restart(char *command) | 27 | static void ar7_machine_restart(char *command) |
28 | { | 28 | { |
29 | u32 *softres_reg = ioremap(AR7_REGS_RESET + | 29 | u32 *softres_reg = ioremap(AR7_REGS_RESET + AR7_RESET_SOFTWARE, 1); |
30 | AR7_RESET_SOFTWARE, 1); | 30 | |
31 | writel(1, softres_reg); | 31 | writel(1, softres_reg); |
32 | } | 32 | } |
33 | 33 | ||
@@ -41,6 +41,7 @@ static void ar7_machine_power_off(void) | |||
41 | { | 41 | { |
42 | u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1); | 42 | u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1); |
43 | u32 power_state = readl(power_reg) | (3 << 30); | 43 | u32 power_state = readl(power_reg) | (3 << 30); |
44 | |||
44 | writel(power_state, power_reg); | 45 | writel(power_state, power_reg); |
45 | ar7_machine_halt(); | 46 | ar7_machine_halt(); |
46 | } | 47 | } |
@@ -49,14 +50,14 @@ const char *get_system_type(void) | |||
49 | { | 50 | { |
50 | u16 chip_id = ar7_chip_id(); | 51 | u16 chip_id = ar7_chip_id(); |
51 | switch (chip_id) { | 52 | switch (chip_id) { |
52 | case AR7_CHIP_7300: | ||
53 | return "TI AR7 (TNETD7300)"; | ||
54 | case AR7_CHIP_7100: | 53 | case AR7_CHIP_7100: |
55 | return "TI AR7 (TNETD7100)"; | 54 | return "TI AR7 (TNETD7100)"; |
56 | case AR7_CHIP_7200: | 55 | case AR7_CHIP_7200: |
57 | return "TI AR7 (TNETD7200)"; | 56 | return "TI AR7 (TNETD7200)"; |
57 | case AR7_CHIP_7300: | ||
58 | return "TI AR7 (TNETD7300)"; | ||
58 | default: | 59 | default: |
59 | return "TI AR7 (Unknown)"; | 60 | return "TI AR7 (unknown)"; |
60 | } | 61 | } |
61 | } | 62 | } |
62 | 63 | ||
@@ -70,7 +71,6 @@ console_initcall(ar7_init_console); | |||
70 | * Initializes basic routines and structures pointers, memory size (as | 71 | * Initializes basic routines and structures pointers, memory size (as |
71 | * given by the bios and saves the command line. | 72 | * given by the bios and saves the command line. |
72 | */ | 73 | */ |
73 | |||
74 | void __init plat_mem_setup(void) | 74 | void __init plat_mem_setup(void) |
75 | { | 75 | { |
76 | unsigned long io_base; | 76 | unsigned long io_base; |
@@ -88,6 +88,5 @@ void __init plat_mem_setup(void) | |||
88 | prom_meminit(); | 88 | prom_meminit(); |
89 | 89 | ||
90 | printk(KERN_INFO "%s, ID: 0x%04x, Revision: 0x%02x\n", | 90 | printk(KERN_INFO "%s, ID: 0x%04x, Revision: 0x%02x\n", |
91 | get_system_type(), | 91 | get_system_type(), ar7_chip_id(), ar7_chip_rev()); |
92 | ar7_chip_id(), ar7_chip_rev()); | ||
93 | } | 92 | } |