patch-2.4.26 linux-2.4.26/arch/ppc/boot/simple/m8260_tty.c
Next file: linux-2.4.26/arch/ppc/config.in
Previous file: linux-2.4.26/arch/ppc/boot/simple/embed_config.c
Back to the patch index
Back to the overall index
- Lines: 65
- Date:
2004-04-14 06:05:27.000000000 -0700
- Orig file:
linux-2.4.25/arch/ppc/boot/simple/m8260_tty.c
- Orig date:
2003-06-13 07:51:31.000000000 -0700
diff -urN linux-2.4.25/arch/ppc/boot/simple/m8260_tty.c linux-2.4.26/arch/ppc/boot/simple/m8260_tty.c
@@ -3,7 +3,8 @@
*/
#include <linux/types.h>
#include <asm/mpc8260.h>
-#include <asm/cpm_8260.h>
+#include <asm/immap_cpm2.h>
+#include <asm/cpm2.h>
uint no_print;
extern char *params[];
@@ -29,12 +30,12 @@
volatile scc_uart_t *sup;
#endif
volatile cbd_t *tbdf, *rbdf;
- volatile immap_t *ip;
- volatile iop8260_t *io;
- volatile cpm8260_t *cp;
+ volatile cpm2_map_t *ip;
+ volatile iop_cpm2_t *io;
+ volatile cpm_cpm2_t *cp;
uint dpaddr, memaddr;
- ip = (immap_t *)IMAP_ADDR;
+ ip = (cpm2_map_t *)CPM_MAP_ADDR;
cp = &ip->im_cpm;
io = &ip->im_ioport;
@@ -223,10 +224,10 @@
volatile char *buf;
volatile smc_uart_t *up;
volatile scc_uart_t *sup;
- volatile immap_t *ip;
+ volatile cpm2_map_t *ip;
int i, nc;
- ip = (immap_t *)IMAP_ADDR;
+ ip = (cpm2_map_t *)CPM_MAP_ADDR;
#ifdef SCC_CONSOLE
sup = (scc_uart_t *)&ip->im_dprambase[PROFF_SCC1 + ((SCC_CONSOLE-1) << 8)];
@@ -255,10 +256,10 @@
volatile char *buf;
volatile smc_uart_t *up;
volatile scc_uart_t *sup;
- volatile immap_t *ip;
+ volatile cpm2_map_t *ip;
extern bd_t *board_info;
- ip = (immap_t *)IMAP_ADDR;
+ ip = (cpm2_map_t *)CPM_MAP_ADDR;
#ifdef SCC_CONSOLE
sup = (scc_uart_t *)&ip->im_dprambase[PROFF_SCC1 + ((SCC_CONSOLE-1) << 8)];
tbdf = (cbd_t *)&ip->im_dprambase[sup->scc_genscc.scc_tbase];
@@ -298,9 +299,9 @@
volatile cbd_t *rbdf;
volatile smc_uart_t *up;
volatile scc_uart_t *sup;
- volatile immap_t *ip;
+ volatile cpm2_map_t *ip;
- ip = (immap_t *)IMAP_ADDR;
+ ip = (cpm2_map_t *)CPM_MAP_ADDR;
#ifdef SCC_CONSOLE
sup = (scc_uart_t *)&ip->im_dprambase[PROFF_SCC1 + ((SCC_CONSOLE-1) << 8)];
rbdf = (cbd_t *)&ip->im_dprambase[sup->scc_genscc.scc_rbase];
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)