diff options
author | Vitaly Bordug <vbordug@ru.mvista.com> | 2005-12-01 03:51:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:48:56 -0500 |
commit | 42ea0d037860690dde07a015d3473a17da35f74a (patch) | |
tree | 02f10934ab3022259880f3118db2f60ce1c1fa38 /arch/ppc | |
parent | 00c1bd54d8c7b6210530cdbb3508125a0bf4a32b (diff) |
[PATCH] ppc32: Fix incorrect PCI frequency value
The time to wait after deasserting PCI_RST has been counted with incorrect
value - this patch fixes the issue.
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/syslib/m82xx_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c index 1d1c3956c1ae..1941a8c7ca9a 100644 --- a/arch/ppc/syslib/m82xx_pci.c +++ b/arch/ppc/syslib/m82xx_pci.c | |||
@@ -248,7 +248,8 @@ pq2ads_setup_pci(struct pci_controller *hose) | |||
248 | pci_div = ( (sccr & SCCR_PCI_MODCK) ? 2 : 1) * | 248 | pci_div = ( (sccr & SCCR_PCI_MODCK) ? 2 : 1) * |
249 | ( ( (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT) + 1); | 249 | ( ( (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT) + 1); |
250 | freq = (uint)((2*binfo->bi_cpmfreq)/(pci_div)); | 250 | freq = (uint)((2*binfo->bi_cpmfreq)/(pci_div)); |
251 | time = (int)666666/freq; | 251 | time = (int)66666666/freq; |
252 | |||
252 | /* due to PCI Local Bus spec, some devices needs to wait such a long | 253 | /* due to PCI Local Bus spec, some devices needs to wait such a long |
253 | time after RST deassertion. More specifically, 0.508s for 66MHz & twice more for 33 */ | 254 | time after RST deassertion. More specifically, 0.508s for 66MHz & twice more for 33 */ |
254 | printk("%s: The PCI bus is %d Mhz.\nWaiting %s after deasserting RST...\n",__FILE__,freq, | 255 | printk("%s: The PCI bus is %d Mhz.\nWaiting %s after deasserting RST...\n",__FILE__,freq, |