Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4d680c7 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents a248afdc 5160b46f

drivers/bcma/core.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ void bcma_core_set_clockmode(struct bcma_device *core, 
	switch (clkmode) {

	case BCMA_CLKMODE_FAST:

		bcma_set32(core, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);

		udelay(64);

		usleep_range(64, 300);

		for (i = 0; i < 1500; i++) {

			if (bcma_read32(core, BCMA_CLKCTLST) &

			    BCMA_CLKCTLST_HAVEHT) {

drivers/bcma/driver_chipcommon_pmu.c

+4 −1
Original line number Diff line number Diff line
@@ -76,7 +76,10 @@ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc) 
	if (max_msk)

		bcma_cc_write32(cc, BCMA_CC_PMU_MAXRES_MSK, max_msk);



	/* Add some delay; allow resources to come up and settle. */

	/*

	 * Add some delay; allow resources to come up and settle.

	 * Delay is required for SoC (early init).

	 */

	mdelay(2);

}

drivers/bcma/driver_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void bcma_pcie_mdio_set_phy(struct bcma_drv_pci *pc, u8 phy) 
		v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);

		if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE)

			break;

		msleep(1);

		usleep_range(1000, 2000);

	}

}
@@ -92,7 +92,7 @@ static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u8 device, u8 address) 
			ret = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_DATA);

			break;

		}

		msleep(1);

		usleep_range(1000, 2000);

	}

	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);

	return ret;
@@ -132,7 +132,7 @@ static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u8 device, 
		v = pcicore_read32(pc, BCMA_CORE_PCI_MDIO_CONTROL);

		if (v & BCMA_CORE_PCI_MDIOCTL_ACCESS_DONE)

			break;

		msleep(1);

		usleep_range(1000, 2000);

	}

	pcicore_write32(pc, BCMA_CORE_PCI_MDIO_CONTROL, 0);

}

drivers/bcma/driver_pci_host.c

+4 −4
Original line number Diff line number Diff line
@@ -425,9 +425,9 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) 
	pc_host->io_resource.flags = IORESOURCE_IO | IORESOURCE_PCI_FIXED;



	/* Reset RC */

	udelay(3000);

	usleep_range(3000, 5000);

	pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST_OE);

	udelay(1000);

	usleep_range(1000, 2000);

	pcicore_write32(pc, BCMA_CORE_PCI_CTL, BCMA_CORE_PCI_CTL_RST |

			BCMA_CORE_PCI_CTL_RST_OE);
@@ -481,7 +481,7 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) 
	 * before issuing configuration requests to PCI Express

	 * devices.

	 */

	udelay(100000);

	msleep(100);



	bcma_core_pci_enable_crs(pc);
@@ -501,7 +501,7 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc) 
	set_io_port_base(pc_host->pci_controller.io_map_base);

	/* Give some time to the PCI controller to configure itself with the new

	 * values. Not waiting at this point causes crashes of the machine. */

	mdelay(10);

	usleep_range(10000, 15000);

	register_pci_controller(&pc_host->pci_controller);

	return;

}

drivers/net/wireless/ath/ath9k/ar9003_mac.c

+17 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked) 
	struct ath9k_hw_capabilities *pCap = &ah->caps;

	struct ath_common *common = ath9k_hw_common(ah);

	u32 sync_cause = 0, async_cause, async_mask = AR_INTR_MAC_IRQ;

	bool fatal_int;



	if (ath9k_hw_mci_is_enabled(ah))

		async_mask |= AR_INTR_ASYNC_MASK_MCI;
@@ -310,6 +311,22 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked) 


	if (sync_cause) {

		ath9k_debug_sync_cause(common, sync_cause);

		fatal_int =

			(sync_cause &

			 (AR_INTR_SYNC_HOST1_FATAL | AR_INTR_SYNC_HOST1_PERR))

			? true : false;



		if (fatal_int) {

			if (sync_cause & AR_INTR_SYNC_HOST1_FATAL) {

				ath_dbg(common, ANY,

					"received PCI FATAL interrupt\n");

			}

			if (sync_cause & AR_INTR_SYNC_HOST1_PERR) {

				ath_dbg(common, ANY,

					"received PCI PERR interrupt\n");

			}

			*masked |= ATH9K_INT_FATAL;

		}



		if (sync_cause & AR_INTR_SYNC_RADM_CPL_TIMEOUT) {

			REG_WRITE(ah, AR_RC, AR_RC_HOSTIF);