aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bcma/driver_pci_host.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2012-09-25 04:17:22 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-09-28 13:54:02 -0400
commit1fd41a65f19bdabb31549af00ce23d4c5c14781a (patch)
tree7fcb424f7ca6c58aa886062ba4ea3a81f6efde54 /drivers/bcma/driver_pci_host.c
parentf1b98bb367f672ee78800fa62880b522bef86eed (diff)
bcma: change delays to follow timers-howto guide
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Cc: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/driver_pci_host.c')
-rw-r--r--drivers/bcma/driver_pci_host.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
index cbae2c231336..9baf886e82df 100644
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -425,9 +425,9 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
425 pc_host->io_resource.flags = IORESOURCE_IO | IORESOURCE_PCI_FIXED; 425 pc_host->io_resource.flags = IORESOURCE_IO | IORESOURCE_PCI_FIXED;
426 426
427 /* Reset RC */ 427 /* Reset RC */
428 udelay(3000); 428 usleep_range(3000, 5000);
429 pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST_OE); 429 pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST_OE);
430 udelay(1000); 430 usleep_range(1000, 2000);
431 pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST | 431 pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST |
432 BCMA_CORE_PCI_CTL_RST_OE); 432 BCMA_CORE_PCI_CTL_RST_OE);
433 433
@@ -481,7 +481,7 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
481 * before issuing configuration requests to PCI Express 481 * before issuing configuration requests to PCI Express
482 * devices. 482 * devices.
483 */ 483 */
484 udelay(100000); 484 msleep(100);
485 485
486 bcma_core_pci_enable_crs(pc); 486 bcma_core_pci_enable_crs(pc);
487 487
@@ -501,7 +501,7 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
501 set_io_port_base(pc_host->pci_controller.io_map_base); 501 set_io_port_base(pc_host->pci_controller.io_map_base);
502 /* Give some time to the PCI controller to configure itself with the new 502 /* Give some time to the PCI controller to configure itself with the new
503 * values. Not waiting at this point causes crashes of the machine. */ 503 * values. Not waiting at this point causes crashes of the machine. */
504 mdelay(10); 504 usleep_range(10000, 15000);
505 register_pci_controller(&pc_host->pci_controller); 505 register_pci_controller(&pc_host->pci_controller);
506 return; 506 return;
507} 507}