update ar7 to 2.6.22.1 (thanks to Matteo Croce for his great help)

[librecmc/librecmc.git] / target / linux / ar7-2.6 / files / arch / mips / ar7 / setup.c

diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c b/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
index fb3d20c18311914157985ebffd282b06cd53ca12..4abc39f1dfcc36f918cf75ccd12e1edcef1b78c0 100644 (file)
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
@@ -49,15 +49,13 @@ static void ar7_machine_power_off(void);
 
 static void ar7_machine_restart(char *command)
 {
-        volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
+       volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
                                                   AR7_RESET_SOFTWARE, 1);
-       prom_printf("Reboot\n");
-        *softres_reg = 1;
+       *softres_reg = 1;
 }
 
 static void ar7_machine_halt(void)
 {
-       prom_printf("Halt\n");
        while (1);
 }
 
@@ -65,8 +63,7 @@ static void ar7_machine_power_off(void)
 {
         volatile u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
        u32 power_state = *power_reg | (3 << 30);
-       prom_printf("Power off\n");
-        *power_reg = power_state;
+       *power_reg = power_state;
        ar7_machine_halt();
 }
 
@@ -112,12 +109,16 @@ void __init plat_mem_setup(void)
        set_io_port_base(io_base);
 
        prom_meminit();
+#warning FIXME: clock initialisation
        ar7_init_clocks();
 
        ioport_resource.start = 0;
        ioport_resource.end   = ~0;
        iomem_resource.start  = 0;
        iomem_resource.end    = ~0;
+
+       printk("%s, ID: 0x%04x, Revision: 0x%02x\n", get_system_type(), 
+               ar7_chip_id(), ar7_chip_rev());
 }
 
 console_initcall(ar7_init_console);