aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2005-06-16 20:30:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:31:23 +0100
commit3bd4c902da14030c9a780cd0c4be2ffe9aee2974 (patch)
tree3ebf15e8aaa4029119028d32721fd7ccbe59bccf /drivers
parent902d21d5313ba08cccadc9fceee2df3cf34e84eb (diff)
downloadkernel_samsung_smdk4412-3bd4c902da14030c9a780cd0c4be2ffe9aee2974.zip
kernel_samsung_smdk4412-3bd4c902da14030c9a780cd0c4be2ffe9aee2974.tar.gz
kernel_samsung_smdk4412-3bd4c902da14030c9a780cd0c4be2ffe9aee2974.tar.bz2
Deal with the bloody KSEG vs CKSEG horror...
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tc/tc.c3
-rw-r--r--drivers/tc/zs.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c
index a89ef4d..2613c51 100644
--- a/drivers/tc/tc.c
+++ b/drivers/tc/tc.c
@@ -197,7 +197,7 @@ void __init tc_init(void)
}
info = (tcinfo *) rex_gettcinfo();
- slot0addr = (unsigned long)KSEG1ADDR(rex_slot_address(0));
+ slot0addr = (unsigned long)CKSEG1ADDR(rex_slot_address(0));
switch (mips_machtype) {
case MACH_DS5000_200:
@@ -245,7 +245,6 @@ void __init tc_init(void)
tc_bus[i].name, tc_bus[i].firmware);
}
#endif
- ioport_resource.end = KSEG2 - 1;
}
}
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index 6bed871..a5dab1a 100644
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -1637,21 +1637,21 @@ static void __init probe_sccs(void)
#ifdef CONFIG_MACH_DECSTATION
case MACH_DS5000_2X0:
case MACH_DS5900:
- system_base = KSEG1ADDR(0x1f800000);
+ system_base = CKSEG1ADDR(0x1f800000);
n_chips = 2;
zs_parms = &ds_parms;
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];
zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1];
break;
case MACH_DS5000_1XX:
- system_base = KSEG1ADDR(0x1c000000);
+ system_base = CKSEG1ADDR(0x1c000000);
n_chips = 2;
zs_parms = &ds_parms;
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];
zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1];
break;
case MACH_DS5000_XX:
- system_base = KSEG1ADDR(0x1c000000);
+ system_base = CKSEG1ADDR(0x1c000000);
n_chips = 1;
zs_parms = &ds_parms;
zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0];