diff options
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index a0c11efeaeeb..40c7c3eeafaf 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
@@ -138,7 +138,6 @@ extern void toshiba_rbtx4927_irq_setup(void); | |||
138 | char *prom_getcmdline(void); | 138 | char *prom_getcmdline(void); |
139 | 139 | ||
140 | #ifdef CONFIG_PCI | 140 | #ifdef CONFIG_PCI |
141 | #define CONFIG_TX4927BUG_WORKAROUND | ||
142 | #undef TX4927_SUPPORT_COMMAND_IO | 141 | #undef TX4927_SUPPORT_COMMAND_IO |
143 | #undef TX4927_SUPPORT_PCI_66 | 142 | #undef TX4927_SUPPORT_PCI_66 |
144 | int tx4927_cpu_clock = 100000000; /* 100MHz */ | 143 | int tx4927_cpu_clock = 100000000; /* 100MHz */ |
@@ -669,15 +668,7 @@ void tx4927_pci_setup(void) | |||
669 | 668 | ||
670 | /* PCI->GB mappings (MEM 16MB) -not used */ | 669 | /* PCI->GB mappings (MEM 16MB) -not used */ |
671 | tx4927_pcicptr->p2gm1plbase = 0xffffffff; | 670 | tx4927_pcicptr->p2gm1plbase = 0xffffffff; |
672 | #ifdef CONFIG_TX4927BUG_WORKAROUND | ||
673 | /* | ||
674 | * TX4927-PCIC-BUG: P2GM1PUBASE must be 0 | ||
675 | * if P2GM0PUBASE was 0. | ||
676 | */ | ||
677 | tx4927_pcicptr->p2gm1pubase = 0; | ||
678 | #else | ||
679 | tx4927_pcicptr->p2gm1pubase = 0xffffffff; | 671 | tx4927_pcicptr->p2gm1pubase = 0xffffffff; |
680 | #endif | ||
681 | tx4927_pcicptr->p2gmgbase[1] = 0; | 672 | tx4927_pcicptr->p2gmgbase[1] = 0; |
682 | 673 | ||
683 | /* PCI->GB mappings (MEM 1MB) -not used */ | 674 | /* PCI->GB mappings (MEM 1MB) -not used */ |
@@ -910,16 +901,6 @@ void __init toshiba_rbtx4927_setup(void) | |||
910 | if (tx4927_ccfg_toeon) | 901 | if (tx4927_ccfg_toeon) |
911 | tx4927_ccfgptr->ccfg |= TX4927_CCFG_TOE; | 902 | tx4927_ccfgptr->ccfg |= TX4927_CCFG_TOE; |
912 | 903 | ||
913 | /* SDRAMC fixup */ | ||
914 | #ifdef CONFIG_TX4927BUG_WORKAROUND | ||
915 | /* | ||
916 | * TX4927-BUG: INF 01-01-18/ BUG 01-01-22 | ||
917 | * G-bus timeout error detection is incorrect | ||
918 | */ | ||
919 | if (tx4927_ccfg_toeon) | ||
920 | tx4927_sdramcptr->tr |= 0x02000000; /* RCD:3tck */ | ||
921 | #endif | ||
922 | |||
923 | tx4927_pci_setup(); | 904 | tx4927_pci_setup(); |
924 | if (tx4927_using_backplane == 1) | 905 | if (tx4927_using_backplane == 1) |
925 | printk("backplane board IS installed\n"); | 906 | printk("backplane board IS installed\n"); |