qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 07:51:55 +02:00
Code

ar7: remove useless volatiles

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10757 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
matteo 2008-04-07 13:49:44 +00:00
parent 81bc82d9a8
commit 8fb0a87a4a
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/linux/ar7/files/arch/mips/ar7/clock.c
View File

@ -48,12 +48,12 @@
#define TNETD7200_DEF_USB_CLK 48000000 #define TNETD7200_DEF_USB_CLK 48000000
struct tnetd7300_clock { struct tnetd7300_clock {
volatile u32 ctrl; u32 ctrl;
#define PREDIV_MASK 0x001f0000 #define PREDIV_MASK 0x001f0000
#define PREDIV_SHIFT 16 #define PREDIV_SHIFT 16
#define POSTDIV_MASK 0x0000001f #define POSTDIV_MASK 0x0000001f
u32 unused1[3]; u32 unused1[3];
volatile u32 pll; u32 pll;
#define MUL_MASK 0x0000f000 #define MUL_MASK 0x0000f000
#define MUL_SHIFT 12 #define MUL_SHIFT 12
#define PLL_MODE_MASK 0x00000001 #define PLL_MODE_MASK 0x00000001
@ -71,17 +71,17 @@ struct tnetd7300_clocks {
}; };
struct tnetd7200_clock { struct tnetd7200_clock {
volatile u32 ctrl; u32 ctrl;
u32 unused1[3]; u32 unused1[3];
#define DIVISOR_ENABLE_MASK 0x00008000 #define DIVISOR_ENABLE_MASK 0x00008000
volatile u32 mul; u32 mul;
volatile u32 prediv; u32 prediv;
volatile u32 postdiv; u32 postdiv;
volatile u32 postdiv2; u32 postdiv2;
u32 unused2[6]; u32 unused2[6];
volatile u32 cmd; u32 cmd;
volatile u32 status; u32 status;
volatile u32 cmden; u32 cmden;
u32 padding[15]; u32 padding[15];
}; };

15
target/linux/ar7/files/arch/mips/ar7/memory.c
View File

@ -37,22 +37,25 @@
static int __init memsize(void) static int __init memsize(void)
{ {
u32 size = (64 << 20); u32 size = (64 << 20);
volatile u32 *addr = (u32 *)KSEG1ADDR(0x14000000 + size - 4); u32 *addr = (u32 *)KSEG1ADDR(0x14000000 + size - 4);
u32 *kernel_end = (u32 *)KSEG1ADDR(CPHYSADDR((u32)&_end)); u32 *kernel_end = (u32 *)KSEG1ADDR(CPHYSADDR((u32)&_end));
u32 *tmpaddr = addr;
while (addr > kernel_end) { while (tmpaddr > kernel_end) {
*addr = (u32)addr; *tmpaddr = (u32)tmpaddr;
size >>= 1; size >>= 1;
addr -= size >> 2; tmpaddr -= size >> 2;
} }
do { do {
addr += size >> 2; tmpaddr += size >> 2;
if (*addr != (u32)addr) if (*tmpaddr != (u32)tmpaddr)
break; break;
size <<= 1; size <<= 1;
} while (size < (64 << 20)); } while (size < (64 << 20));
writel(tmpaddr, &addr);
return size; return size;
} }

2
target/linux/ar7/patches-2.6.24/100-board_support.patch
View File

@ -50,7 +50,7 @@ Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c
+ *(u32 *)(ebase + 0x20C) = 0x00000000; + *(u32 *)(ebase + 0x20C) = 0x00000000;
+ flush_icache_range(ebase + 0x200, ebase + 0x210); + flush_icache_range(ebase + 0x200, ebase + 0x210);
+ } else { + } else {
+ *(volatile u32 *)(ebase + 0x200) = + *(u32 *)(ebase + 0x200) =
+ 0x08000000 | (0x03ffffff & (handler >> 2)); + 0x08000000 | (0x03ffffff & (handler >> 2));
+ flush_icache_range(ebase + 0x200, ebase + 0x204); + flush_icache_range(ebase + 0x200, ebase + 0x204);
+ } + }