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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
4xx
/
sycamore.c
diff --git
a/arch/ppc/platforms/4xx/sycamore.c
b/arch/ppc/platforms/4xx/sycamore.c
index
d8019ee
..
bab31eb
100644
(file)
--- a/
arch/ppc/platforms/4xx/sycamore.c
+++ b/
arch/ppc/platforms/4xx/sycamore.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/4xx/sycamore.c
- *
* Architecture- / platform-specific boot-time initialization code for
* IBM PowerPC 4xx based boards.
*
* Architecture- / platform-specific boot-time initialization code for
* IBM PowerPC 4xx based boards.
*
@@
-88,9
+86,6
@@
ppc405_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
void __init
sycamore_setup_arch(void)
{
void __init
sycamore_setup_arch(void)
{
-#define SYCAMORE_PS2_BASE 0xF0100000
-#define SYCAMORE_FPGA_BASE 0xF0300000
-
void *fpga_brdc;
unsigned char fpga_brdc_data;
void *fpga_enable;
void *fpga_brdc;
unsigned char fpga_brdc_data;
void *fpga_enable;
@@
-100,7
+95,7
@@
sycamore_setup_arch(void)
ppc4xx_setup_arch();
ppc4xx_setup_arch();
- ibm_ocp_set_emac(0,
1
);
+ ibm_ocp_set_emac(0,
0
);
kb_data = ioremap(SYCAMORE_PS2_BASE, 8);
if (!kb_data) {
kb_data = ioremap(SYCAMORE_PS2_BASE, 8);
if (!kb_data) {
@@
-111,7
+106,7
@@
sycamore_setup_arch(void)
kb_cs = kb_data + 1;
kb_cs = kb_data + 1;
- fpga_status = ioremap(
SYCAMORE
_FPGA_BASE, 8);
+ fpga_status = ioremap(
PPC40x
_FPGA_BASE, 8);
if (!fpga_status) {
printk(KERN_CRIT
"sycamore_setup_arch() fpga_status ioremap failed\n");
if (!fpga_status) {
printk(KERN_CRIT
"sycamore_setup_arch() fpga_status ioremap failed\n");