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

Commit f9c4d420 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 75be4372 c66cfd53

drivers/bcma/bcma_private.h

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc); 
#endif /* CONFIG_BCMA_DRIVER_MIPS */



/* driver_chipcommon_pmu.c */

u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);

u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);



#ifdef CONFIG_BCMA_SFLASH

/* driver_chipcommon_sflash.c */

drivers/bcma/driver_chipcommon.c

+5 −5
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ static inline u32 bcma_cc_write32_masked(struct bcma_drv_cc *cc, u16 offset, 
	return value;

}



static u32 bcma_chipco_alp_clock(struct bcma_drv_cc *cc)

static u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc)

{

	if (cc->capabilities & BCMA_CC_CAP_PMU)

		return bcma_pmu_alp_clock(cc);

		return bcma_pmu_get_alp_clock(cc);



	return 20000000;

}
@@ -79,12 +79,12 @@ static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc) 
	if (cc->capabilities & BCMA_CC_CAP_PMU) {

		if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)

			/* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */

			return bcma_chipco_alp_clock(cc) / 4000;

			return bcma_chipco_get_alp_clock(cc) / 4000;

		else

			/* based on 32KHz ILP clock */

			return 32;

	} else {

		return bcma_chipco_alp_clock(cc) / 1000;

		return bcma_chipco_get_alp_clock(cc) / 1000;

	}

}
@@ -236,7 +236,7 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) 
	struct bcma_serial_port *ports = cc->serial_ports;



	if (ccrev >= 11 && ccrev != 15) {

		baud_base = bcma_chipco_alp_clock(cc);

		baud_base = bcma_chipco_get_alp_clock(cc);

		if (ccrev >= 21) {

			/* Turn off UART clock before switching clocksource. */

			bcma_cc_write32(cc, BCMA_CC_CORECTL,

drivers/bcma/driver_chipcommon_pmu.c

+21 −18
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void bcma_pmu_init(struct bcma_drv_cc *cc) 
	bcma_pmu_workarounds(cc);

}



u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc)

u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;
@@ -196,7 +196,7 @@ u32 bcma_pmu_alp_clock(struct bcma_drv_cc *cc) 
/* Find the output of the "m" pll divider given pll controls that start with

 * pllreg "pll0" i.e. 12 for main 6 for phy, 0 for misc.

 */

static u32 bcma_pmu_clock(struct bcma_drv_cc *cc, u32 pll0, u32 m)

static u32 bcma_pmu_pll_clock(struct bcma_drv_cc *cc, u32 pll0, u32 m)

{

	u32 tmp, div, ndiv, p1, p2, fc;

	struct bcma_bus *bus = cc->core->bus;
@@ -225,14 +225,14 @@ static u32 bcma_pmu_clock(struct bcma_drv_cc *cc, u32 pll0, u32 m) 
	ndiv = (tmp & BCMA_CC_PPL_NDIV_MASK) >> BCMA_CC_PPL_NDIV_SHIFT;



	/* Do calculation in Mhz */

	fc = bcma_pmu_alp_clock(cc) / 1000000;

	fc = bcma_pmu_get_alp_clock(cc) / 1000000;

	fc = (p1 * ndiv * fc) / p2;



	/* Return clock in Hertz */

	return (fc / div) * 1000000;

}



static u32 bcma_pmu_clock_bcm4706(struct bcma_drv_cc *cc, u32 pll0, u32 m)

static u32 bcma_pmu_pll_clock_bcm4706(struct bcma_drv_cc *cc, u32 pll0, u32 m)

{

	u32 tmp, ndiv, p1div, p2div;

	u32 clock;
@@ -263,7 +263,7 @@ static u32 bcma_pmu_clock_bcm4706(struct bcma_drv_cc *cc, u32 pll0, u32 m) 
}



/* query bus clock frequency for PMU-enabled chipcommon */

static u32 bcma_pmu_get_clockcontrol(struct bcma_drv_cc *cc)

static u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;
@@ -271,40 +271,42 @@ static u32 bcma_pmu_get_clockcontrol(struct bcma_drv_cc *cc) 
	case BCMA_CHIP_ID_BCM4716:

	case BCMA_CHIP_ID_BCM4748:

	case BCMA_CHIP_ID_BCM47162:

		return bcma_pmu_clock(cc, BCMA_CC_PMU4716_MAINPLL_PLL0,

		return bcma_pmu_pll_clock(cc, BCMA_CC_PMU4716_MAINPLL_PLL0,

					  BCMA_CC_PMU5_MAINPLL_SSB);

	case BCMA_CHIP_ID_BCM5356:

		return bcma_pmu_clock(cc, BCMA_CC_PMU5356_MAINPLL_PLL0,

		return bcma_pmu_pll_clock(cc, BCMA_CC_PMU5356_MAINPLL_PLL0,

					  BCMA_CC_PMU5_MAINPLL_SSB);

	case BCMA_CHIP_ID_BCM5357:

	case BCMA_CHIP_ID_BCM4749:

		return bcma_pmu_clock(cc, BCMA_CC_PMU5357_MAINPLL_PLL0,

		return bcma_pmu_pll_clock(cc, BCMA_CC_PMU5357_MAINPLL_PLL0,

					  BCMA_CC_PMU5_MAINPLL_SSB);

	case BCMA_CHIP_ID_BCM4706:

		return bcma_pmu_clock_bcm4706(cc, BCMA_CC_PMU4706_MAINPLL_PLL0,

		return bcma_pmu_pll_clock_bcm4706(cc,

						  BCMA_CC_PMU4706_MAINPLL_PLL0,

						  BCMA_CC_PMU5_MAINPLL_SSB);

	case BCMA_CHIP_ID_BCM53572:

		return 75000000;

	default:

		bcma_warn(bus, "No backplane clock specified for %04X device, pmu rev. %d, using default %d Hz\n",

		bcma_warn(bus, "No bus clock specified for %04X device, pmu rev. %d, using default %d Hz\n",

			  bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_HT_CLOCK);

	}

	return BCMA_CC_PMU_HT_CLOCK;

}



/* query cpu clock frequency for PMU-enabled chipcommon */

u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc)

u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc)

{

	struct bcma_bus *bus = cc->core->bus;



	if (bus->chipinfo.id == BCMA_CHIP_ID_BCM53572)

		return 300000000;



	/* New PMUs can have different clock for bus and CPU */

	if (cc->pmu.rev >= 5) {

		u32 pll;

		switch (bus->chipinfo.id) {

		case BCMA_CHIP_ID_BCM4706:

			return bcma_pmu_clock_bcm4706(cc,

			return bcma_pmu_pll_clock_bcm4706(cc,

						BCMA_CC_PMU4706_MAINPLL_PLL0,

						BCMA_CC_PMU5_MAINPLL_CPU);

		case BCMA_CHIP_ID_BCM5356:
@@ -319,10 +321,11 @@ u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc) 
			break;

		}



		return bcma_pmu_clock(cc, pll, BCMA_CC_PMU5_MAINPLL_CPU);

		return bcma_pmu_pll_clock(cc, pll, BCMA_CC_PMU5_MAINPLL_CPU);

	}



	return bcma_pmu_get_clockcontrol(cc);

	/* On old PMUs CPU has the same clock as the bus */

	return bcma_pmu_get_bus_clock(cc);

}



static void bcma_pmu_spuravoid_pll_write(struct bcma_drv_cc *cc, u32 offset,

drivers/bcma/driver_mips.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) 
			    bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) &

			    ~(1 << irqflag));

	else

		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0);

		bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0);



	/* assign the new one */

	if (irq == 0) {
@@ -171,7 +171,7 @@ u32 bcma_cpu_clock(struct bcma_drv_mips *mcore) 
	struct bcma_bus *bus = mcore->core->bus;



	if (bus->drv_cc.capabilities & BCMA_CC_CAP_PMU)

		return bcma_pmu_get_clockcpu(&bus->drv_cc);

		return bcma_pmu_get_cpu_clock(&bus->drv_cc);



	bcma_err(bus, "No PMU available, need this to get the cpu clock\n");

	return 0;

drivers/net/wireless/ath/ath5k/base.c

+3 −14
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf) 
		return;

	dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,

			DMA_TO_DEVICE);

	dev_kfree_skb_any(bf->skb);

	ieee80211_free_txskb(ah->hw, bf->skb);

	bf->skb = NULL;

	bf->skbaddr = 0;

	bf->desc->ds_data = 0;
@@ -1336,20 +1336,9 @@ ath5k_receive_frame(struct ath5k_hw *ah, struct sk_buff *skb, 
	 * 15bit only. that means TSF extension has to be done within

	 * 32768usec (about 32ms). it might be necessary to move this to

	 * the interrupt handler, like it is done in madwifi.

	 *

	 * Unfortunately we don't know when the hardware takes the rx

	 * timestamp (beginning of phy frame, data frame, end of rx?).

	 * The only thing we know is that it is hardware specific...

	 * On AR5213 it seems the rx timestamp is at the end of the

	 * frame, but I'm not sure.

	 *

	 * NOTE: mac80211 defines mactime at the beginning of the first

	 * data symbol. Since we don't have any time references it's

	 * impossible to comply to that. This affects IBSS merge only

	 * right now, so it's not too bad...

	 */

	rxs->mactime = ath5k_extend_tsf(ah, rs->rs_tstamp);

	rxs->flag |= RX_FLAG_MACTIME_START;

	rxs->flag |= RX_FLAG_MACTIME_END;



	rxs->freq = ah->curchan->center_freq;

	rxs->band = ah->curchan->band;
@@ -1576,7 +1565,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb, 
	return;



drop_packet:

	dev_kfree_skb_any(skb);

	ieee80211_free_txskb(hw, skb);

}



static void