git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_c
/
setup.c
diff --git
a/arch/mips/momentum/ocelot_c/setup.c
b/arch/mips/momentum/ocelot_c/setup.c
index
1079858
..
021c00e
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/setup.c
+++ b/
arch/mips/momentum/ocelot_c/setup.c
@@
-67,7
+67,7
@@
#include <asm/mv64340.h>
#include "ocelot_c_fpga.h"
#include <asm/mv64340.h>
#include "ocelot_c_fpga.h"
-unsigned long m
v64340
_base;
+unsigned long m
arvell
_base;
extern unsigned long mv64340_sram_base;
unsigned long cpu_clock;
extern unsigned long mv64340_sram_base;
unsigned long cpu_clock;
@@
-117,7
+117,7
@@
void PMON_v2_setup(void)
/* m-sys and internal SRAM */
add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfffffffffe000000, PM_16M);
/* m-sys and internal SRAM */
add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfffffffffe000000, PM_16M);
- m
v64340
_base = 0xfffffffff4000000;
+ m
arvell
_base = 0xfffffffff4000000;
mv64340_sram_base = 0xfffffffffe000000;
#else
/* marvell and extra space */
mv64340_sram_base = 0xfffffffffe000000;
#else
/* marvell and extra space */
@@
-127,7
+127,7
@@
void PMON_v2_setup(void)
/* m-sys and internal SRAM */
add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfe000000, PM_16M);
/* m-sys and internal SRAM */
add_wired_entry(ENTRYLO(0xfe000000), ENTRYLO(0xff000000), 0xfe000000, PM_16M);
- m
v64340
_base = 0xf4000000;
+ m
arvell
_base = 0xf4000000;
mv64340_sram_base = 0xfe000000;
#endif
}
mv64340_sram_base = 0xfe000000;
#endif
}
@@
-193,7
+193,7
@@
int m48t37y_set_time(unsigned long sec)
rtc_base[0x7ff9] = BIN2BCD(tm.tm_sec);
/* day of week -- not really used, but let's keep it up-to-date */
rtc_base[0x7ff9] = BIN2BCD(tm.tm_sec);
/* day of week -- not really used, but let's keep it up-to-date */
- rtc_base[0x7ffc] =
CONV_
BIN2BCD(tm.tm_wday + 1);
+ rtc_base[0x7ffc] = BIN2BCD(tm.tm_wday + 1);
/* disable writing */
rtc_base[0x7ff8] = 0x00;
/* disable writing */
rtc_base[0x7ff8] = 0x00;