diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/tc/tc.c | 3 | ||||
-rw-r--r-- | drivers/tc/zs.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c index a89ef4df80c3..2613c5135c09 100644 --- a/drivers/tc/tc.c +++ b/drivers/tc/tc.c | |||
@@ -197,7 +197,7 @@ void __init tc_init(void) | |||
197 | } | 197 | } |
198 | 198 | ||
199 | info = (tcinfo *) rex_gettcinfo(); | 199 | info = (tcinfo *) rex_gettcinfo(); |
200 | slot0addr = (unsigned long)KSEG1ADDR(rex_slot_address(0)); | 200 | slot0addr = (unsigned long)CKSEG1ADDR(rex_slot_address(0)); |
201 | 201 | ||
202 | switch (mips_machtype) { | 202 | switch (mips_machtype) { |
203 | case MACH_DS5000_200: | 203 | case MACH_DS5000_200: |
@@ -245,7 +245,6 @@ void __init tc_init(void) | |||
245 | tc_bus[i].name, tc_bus[i].firmware); | 245 | tc_bus[i].name, tc_bus[i].firmware); |
246 | } | 246 | } |
247 | #endif | 247 | #endif |
248 | ioport_resource.end = KSEG2 - 1; | ||
249 | } | 248 | } |
250 | } | 249 | } |
251 | 250 | ||
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index 6bed8713897e..a5dab1ac568c 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c | |||
@@ -1637,21 +1637,21 @@ static void __init probe_sccs(void) | |||
1637 | #ifdef CONFIG_MACH_DECSTATION | 1637 | #ifdef CONFIG_MACH_DECSTATION |
1638 | case MACH_DS5000_2X0: | 1638 | case MACH_DS5000_2X0: |
1639 | case MACH_DS5900: | 1639 | case MACH_DS5900: |
1640 | system_base = KSEG1ADDR(0x1f800000); | 1640 | system_base = CKSEG1ADDR(0x1f800000); |
1641 | n_chips = 2; | 1641 | n_chips = 2; |
1642 | zs_parms = &ds_parms; | 1642 | zs_parms = &ds_parms; |
1643 | zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0]; | 1643 | zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0]; |
1644 | zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1]; | 1644 | zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1]; |
1645 | break; | 1645 | break; |
1646 | case MACH_DS5000_1XX: | 1646 | case MACH_DS5000_1XX: |
1647 | system_base = KSEG1ADDR(0x1c000000); | 1647 | system_base = CKSEG1ADDR(0x1c000000); |
1648 | n_chips = 2; | 1648 | n_chips = 2; |
1649 | zs_parms = &ds_parms; | 1649 | zs_parms = &ds_parms; |
1650 | zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0]; | 1650 | zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0]; |
1651 | zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1]; | 1651 | zs_parms->irq1 = dec_interrupt[DEC_IRQ_SCC1]; |
1652 | break; | 1652 | break; |
1653 | case MACH_DS5000_XX: | 1653 | case MACH_DS5000_XX: |
1654 | system_base = KSEG1ADDR(0x1c000000); | 1654 | system_base = CKSEG1ADDR(0x1c000000); |
1655 | n_chips = 1; | 1655 | n_chips = 1; |
1656 | zs_parms = &ds_parms; | 1656 | zs_parms = &ds_parms; |
1657 | zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0]; | 1657 | zs_parms->irq0 = dec_interrupt[DEC_IRQ_SCC0]; |