adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 20:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MIPS] Sibyte: Replace use of removed IO_SPACE_BASE with IOADDR.

Browse source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2007-11-06 00:43:51 +00:00
parent bb856c5b49
commit 33b75e5c51
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/mips/mm/cerr-sb1.c
View file

@ -154,7 +154,7 @@ static void check_bus_watcher(void)
if (status & ~(1UL << 31)) { if (status & ~(1UL << 31)) {
l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS));
#ifdef DUMP_L2_ECC_TAG_ON_ERROR #ifdef DUMP_L2_ECC_TAG_ON_ERROR
l2_tag = in64(IO_SPACE_BASE | A_L2_ECC_TAG); l2_tag = in64(IOADDR(A_L2_ECC_TAG));
#endif #endif
memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS));
printk("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); printk("Bus watcher error counters: %08x %08x\n", l2_err, memio_err);
@ -183,9 +183,9 @@ asmlinkage void sb1_cache_error(void)
#ifdef CONFIG_SIBYTE_BW_TRACE #ifdef CONFIG_SIBYTE_BW_TRACE
/* Freeze the trace buffer now */ /* Freeze the trace buffer now */
#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
csr_out32(M_BCM1480_SCD_TRACE_CFG_FREEZE, IO_SPACE_BASE | A_SCD_TRACE_CFG); csr_out32(M_BCM1480_SCD_TRACE_CFG_FREEZE, IOADDR(A_SCD_TRACE_CFG));
#else #else
csr_out32(M_SCD_TRACE_CFG_FREEZE, IO_SPACE_BASE | A_SCD_TRACE_CFG); csr_out32(M_SCD_TRACE_CFG_FREEZE, IOADDR(A_SCD_TRACE_CFG));
#endif #endif
printk("Trace buffer frozen\n"); printk("Trace buffer frozen\n");
#endif #endif

6
arch/mips/sibyte/bcm1480/irq.c
View file

@ -370,11 +370,11 @@ void __init arch_init_irq(void)
#endif #endif
/* Setup uart 1 settings, mapper */ /* Setup uart 1 settings, mapper */
/* QQQ FIXME */ /* QQQ FIXME */
__raw_writeq(M_DUART_IMR_BRK, IO_SPACE_BASE + A_DUART_IMRREG(kgdb_port)); __raw_writeq(M_DUART_IMR_BRK, IOADDR(A_DUART_IMRREG(kgdb_port)));
__raw_writeq(IMR_IP6_VAL, __raw_writeq(IMR_IP6_VAL,
IO_SPACE_BASE + A_BCM1480_IMR_REGISTER(0, R_BCM1480_IMR_INTERRUPT_MAP_BASE_H) + IOADDR(A_BCM1480_IMR_REGISTER(0, R_BCM1480_IMR_INTERRUPT_MAP_BASE_H) +
(kgdb_irq<<3)); (kgdb_irq << 3)));
bcm1480_unmask_irq(0, kgdb_irq); bcm1480_unmask_irq(0, kgdb_irq);
#ifdef CONFIG_GDB_CONSOLE #ifdef CONFIG_GDB_CONSOLE