diff options
| author | Tom Rini <trini@kernel.crashing.org> | 2005-01-14 23:20:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:20:43 -0800 |
| commit | a69d951a592f656531eec8b0cbb12cf29c2644e2 (patch) | |
| tree | bea2ac3bfb8c074f09498cc0c0f5d5fde001c5e4 /arch | |
| parent | f48d0ebfe4623b082237d414feb3985d7452a3ef (diff) | |
| download | history-a69d951a592f656531eec8b0cbb12cf29c2644e2.tar.gz | |
[PATCH] ppc32: Fix mpc8272ads
When I reworked the m82xx init functions, I inadvertantly broke the callout
we had from ppc_md.setup_arch() that boards can use to poke & prod things,
once mappings are set. The following adds in a callback and updates the
one m82xx board that needs it.
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/platforms/pq2ads.c | 4 | ||||
| -rw-r--r-- | arch/ppc/syslib/m8260_setup.c | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/arch/ppc/platforms/pq2ads.c b/arch/ppc/platforms/pq2ads.c index cecaba630565f3..6a1475c1e128ea 100644 --- a/arch/ppc/platforms/pq2ads.c +++ b/arch/ppc/platforms/pq2ads.c @@ -19,8 +19,8 @@ #include <asm/mpc8260.h> void __init -m82xx_board_init(void) +m82xx_board_setup(void) { /* Enable the 2nd UART port */ - *(volatile uint *)(BCSR_ADDR + 4) &= ~BCSR1_RS232_EN2; + *(volatile uint *)(BCSR_ADDR + 4) &= ~BCSR1_RS232_EN2; } diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c index 2a8c23cbc0c427..f3c12a51bf3e08 100644 --- a/arch/ppc/syslib/m8260_setup.c +++ b/arch/ppc/syslib/m8260_setup.c @@ -37,6 +37,12 @@ extern void cpm2_reset(void); extern void m8260_find_bridges(void); extern void idma_pci9_init(void); +/* Place-holder for board-specific init */ +void __attribute__ ((weak)) __init +m82xx_board_setup(void) +{ +} + static void __init m8260_setup_arch(void) { @@ -56,6 +62,7 @@ m8260_setup_arch(void) if (initrd_start) ROOT_DEV = Root_RAM0; #endif + m82xx_board_setup(); } /* The decrementer counts at the system (internal) clock frequency @@ -203,7 +210,7 @@ m8260_map_io(void) io_block_mapping(IO_VIRT_ADDR, IO_PHYS_ADDR, 0x10000000, _PAGE_IO); } -/* Place-holder for board-specific init */ +/* Place-holder for board-specific ppc_md hooking */ void __attribute__ ((weak)) __init m82xx_board_init(void) { |