]> git.neil.brown.name Git - history.git/commitdiff
[PATCH] ppc32: Have the 8260 board-hook happen a bit later
authorTom Rini <trini@kernel.crashing.org>
Thu, 25 Nov 2004 07:59:48 +0000 (23:59 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 25 Nov 2004 07:59:48 +0000 (23:59 -0800)
Borut Lukic <borutlukic@email.si> brought to my attention that in
platform_init() on 8260 the board hook was being called too early to allow for
overrides (e.g.  different memory sizings functions or rtc, or anything else).
 This moves the call to the end of platform_init() and I suspect fixes some
unnoticed yet bugs in a number of 8260 platforms.

Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/ppc/syslib/m8260_setup.c

index 868ff81be4554d693145b599aed015e6b6368527..2a8c23cbc0c4272c2af7cbc0586cfe0fceab60f3 100644 (file)
@@ -242,9 +242,6 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                strcpy(cmd_line, (char *)(r6+KERNELBASE));
        }
 
-       /* Call back for board-specific settings. */
-       m82xx_board_init();
-
        ppc_md.setup_arch               = m8260_setup_arch;
        ppc_md.show_cpuinfo             = m8260_show_cpuinfo;
        ppc_md.init_IRQ                 = m8260_init_IRQ;
@@ -260,4 +257,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
        ppc_md.find_end_of_memory       = m8260_find_end_of_memory;
        ppc_md.setup_io_mappings        = m8260_map_io;
+
+       /* Call back for board-specific settings and overrides. */
+       m82xx_board_init();
 }