Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33b75e5c authored by Ralf Baechle's avatar Ralf Baechle
Browse files

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



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent bb856c5b

arch/mips/mm/cerr-sb1.c

+3 −3
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static void check_bus_watcher(void) 
	if (status & ~(1UL << 31)) {

		l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS));

#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

		memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS));

		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

	/* Freeze the trace buffer now */

#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

	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

	printk("Trace buffer frozen\n");

#endif

arch/mips/sibyte/bcm1480/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -370,11 +370,11 @@ void __init arch_init_irq(void) 
#endif

		/* Setup uart 1 settings, mapper */

		/* 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,

			     IO_SPACE_BASE + A_BCM1480_IMR_REGISTER(0, R_BCM1480_IMR_INTERRUPT_MAP_BASE_H) +

			     (kgdb_irq<<3));

			     IOADDR(A_BCM1480_IMR_REGISTER(0, R_BCM1480_IMR_INTERRUPT_MAP_BASE_H) +

			     (kgdb_irq << 3)));

		bcm1480_unmask_irq(0, kgdb_irq);



#ifdef CONFIG_GDB_CONSOLE