From: Tom Rini <trini@kernel.crashing.org>
To: Andrew Morton <akpm@osdl.org>
Cc: alebas@televes.com, linuxppc-embedded@ozlabs.org
Subject: [PATCH 2.6.10] ppc32: Fix mpc8272ads
Date: Wed, 12 Jan 2005 07:22:22 -0700 [thread overview]
Message-ID: <20050112142222.GR3391@smtp.west.cox.net> (raw)
In-Reply-To: <20050112141902.GQ3391@smtp.west.cox.net>
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>
--- 1.28/arch/ppc/syslib/m8260_setup.c 2004-11-24 23:42:43 -07:00
+++ edited/arch/ppc/syslib/m8260_setup.c 2005-01-12 07:18:14 -07:00
@@ -37,6 +37,12 @@
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 @@
if (initrd_start)
ROOT_DEV = Root_RAM0;
#endif
+ m82xx_board_setup();
}
/* The decrementer counts at the system (internal) clock frequency
@@ -203,7 +210,7 @@
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)
{
--- 1.6/arch/ppc/platforms/pq2ads.c 2004-08-13 16:33:54 -07:00
+++ edited/arch/ppc/platforms/pq2ads.c 2005-01-10 16:32:52 -07:00
@@ -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;
}
--
Tom Rini
http://gate.crashing.org/~trini/
prev parent reply other threads:[~2005-01-12 14:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-09 9:42 Kernel 2.6.10 running on mpc8272ads alebas
2005-01-05 17:48 ` Tom Rini
2005-01-05 19:03 ` Dan Malek
2005-01-12 14:19 ` Tom Rini
2005-01-12 14:22 ` Tom Rini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050112142222.GR3391@smtp.west.cox.net \
--to=trini@kernel.crashing.org \
--cc=akpm@osdl.org \
--cc=alebas@televes.com \
--cc=linuxppc-embedded@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).