From 13ac16c77f791167b60e4b5d8e36033ec0c7ead3 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 30 Jan 2008 15:25:48 +0000 Subject: [adm5120] add preliminary support for 2.6.24 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10329 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../include/asm-mips/mach-adm5120/adm5120_info.h | 1 - .../include/asm-mips/mach-adm5120/adm5120_switch.h | 6 ++++-- .../files/include/asm-mips/mach-adm5120/war.h | 25 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 target/linux/adm5120/files/include/asm-mips/mach-adm5120/war.h (limited to 'target/linux/adm5120/files/include') diff --git a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_info.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_info.h index a2e8d48a7..401000197 100644 --- a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_info.h +++ b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_info.h @@ -50,7 +50,6 @@ extern unsigned char adm5120_eth_vlans[6]; extern void adm5120_soc_init(void) __init; extern void adm5120_mem_init(void) __init; -extern void adm5120_time_init(void) __init; extern void adm5120_ndelay(u32 ns); extern void adm5120_restart(char *command); diff --git a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h index bc9b6f662..2dbb09776 100644 --- a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h +++ b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h @@ -18,8 +18,10 @@ #ifndef _ADM5120_SWITCH_H_ #define _ADM5120_SWITCH_H_ -#define BIT(at) (1 << (at)) -#define BITMASK(len) ((1 << (len))-1) +#ifndef BIT +# define BIT(at) (1 << (at)) +#endif +#define BITMASK(len) (BIT(len)-1) #define SW_READ_REG(r) __raw_readl( \ (void __iomem *)KSEG1ADDR(ADM5120_SWITCH_BASE) + r) diff --git a/target/linux/adm5120/files/include/asm-mips/mach-adm5120/war.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/war.h new file mode 100644 index 000000000..87c35f375 --- /dev/null +++ b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/war.h @@ -0,0 +1,25 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 2002, 2004, 2007 by Ralf Baechle + */ +#ifndef __ASM_MIPS_MACH_ADM5120_WAR_H +#define __ASM_MIPS_MACH_ADM5120_WAR_H + +#define R4600_V1_INDEX_ICACHEOP_WAR 0 +#define R4600_V1_HIT_CACHEOP_WAR 0 +#define R4600_V2_HIT_CACHEOP_WAR 0 +#define R5432_CP0_INTERRUPT_WAR 0 +#define BCM1250_M3_WAR 0 +#define SIBYTE_1956_WAR 0 +#define MIPS4K_ICACHE_REFILL_WAR 0 +#define MIPS_CACHE_SYNC_WAR 0 +#define TX49XX_ICACHE_INDEX_INV_WAR 0 +#define RM9000_CDEX_SMP_WAR 0 +#define ICACHE_REFILLS_WORKAROUND_WAR 0 +#define R10000_LLSC_WAR 0 +#define MIPS34K_MISSED_ITLB_WAR 0 + +#endif /* __ASM_MIPS_MACH_ADM5120_WAR_H */ -- cgit v1.2.3