Commit f5c70dd7 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] Fix build errors related to wbflush.h on tx4927/tx4938.



TX49 CPUs have a SYNC instruction so that CONFIG_CPU_HAS_WB is no
longer needed.
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 5536b235
......@@ -53,19 +53,9 @@ void __init tx4927_time_init(void);
void dump_cp0(char *key);
void (*__wbflush) (void);
static void tx4927_write_buffer_flush(void)
{
__asm__ __volatile__
("sync\n\t" "nop\n\t" "loop: bc0f loop\n\t" "nop\n\t");
}
void __init plat_mem_setup(void)
{
board_time_init = tx4927_time_init;
__wbflush = tx4927_write_buffer_flush;
#ifdef CONFIG_TOSHIBA_RBTX4927
{
......
......@@ -129,6 +129,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
#include <asm/processor.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <asm/wbflush.h>
#include <linux/bootmem.h>
#include <linux/blkdev.h>
#ifdef CONFIG_RTC_DS1742
......
......@@ -30,6 +30,7 @@
#include <asm/irq.h>
#include <asm/mipsregs.h>
#include <asm/system.h>
#include <asm/wbflush.h>
#include <asm/tx4938/rbtx4938.h>
/**********************************************************************************/
......
......@@ -41,29 +41,10 @@ void __init tx4938_setup(void);
void __init tx4938_time_init(void);
void dump_cp0(char *key);
void (*__wbflush) (void);
static void
tx4938_write_buffer_flush(void)
{
mmiowb();
__asm__ __volatile__(
".set push\n\t"
".set noreorder\n\t"
"lw $0,%0\n\t"
"nop\n\t"
".set pop"
: /* no output */
: "m" (*(int *)KSEG1)
: "memory");
}
void __init
plat_mem_setup(void)
{
board_time_init = tx4938_time_init;
__wbflush = tx4938_write_buffer_flush;
toshiba_rbtx4938_setup();
}
......
......@@ -83,6 +83,7 @@ IRQ Device
#include <asm/processor.h>
#include <asm/reboot.h>
#include <asm/time.h>
#include <asm/wbflush.h>
#include <linux/bootmem.h>
#include <asm/tx4938/rbtx4938.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment