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

Commit 9f6e20ce 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 d1d182e0 5bd5e9a6

drivers/bcma/bcma_private.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ void bcma_bus_unregister(struct bcma_bus *bus); 
int __init bcma_bus_early_register(struct bcma_bus *bus,

				   struct bcma_device *core_cc,

				   struct bcma_device *core_mips);

#ifdef CONFIG_PM

int bcma_bus_resume(struct bcma_bus *bus);

#endif



/* scan.c */

int bcma_bus_scan(struct bcma_bus *bus);

drivers/bcma/host_pci.c

+37 −0
Original line number Diff line number Diff line
@@ -234,6 +234,41 @@ static void bcma_host_pci_remove(struct pci_dev *dev) 
	pci_set_drvdata(dev, NULL);

}



#ifdef CONFIG_PM

static int bcma_host_pci_suspend(struct pci_dev *dev, pm_message_t state)

{

	/* Host specific */

	pci_save_state(dev);

	pci_disable_device(dev);

	pci_set_power_state(dev, pci_choose_state(dev, state));



	return 0;

}



static int bcma_host_pci_resume(struct pci_dev *dev)

{

	struct bcma_bus *bus = pci_get_drvdata(dev);

	int err;



	/* Host specific */

	pci_set_power_state(dev, 0);

	err = pci_enable_device(dev);

	if (err)

		return err;

	pci_restore_state(dev);



	/* Bus specific */

	err = bcma_bus_resume(bus);

	if (err)

		return err;



	return 0;

}

#else /* CONFIG_PM */

# define bcma_host_pci_suspend	NULL

# define bcma_host_pci_resume	NULL

#endif /* CONFIG_PM */



static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
@@ -249,6 +284,8 @@ static struct pci_driver bcma_pci_bridge_driver = { 
	.id_table = bcma_pci_bridge_tbl,

	.probe = bcma_host_pci_probe,

	.remove = bcma_host_pci_remove,

	.suspend = bcma_host_pci_suspend,

	.resume = bcma_host_pci_resume,

};



int __init bcma_host_pci_init(void)

drivers/bcma/main.c

+16 −0
Original line number Diff line number Diff line
@@ -240,6 +240,22 @@ int __init bcma_bus_early_register(struct bcma_bus *bus, 
	return 0;

}



#ifdef CONFIG_PM

int bcma_bus_resume(struct bcma_bus *bus)

{

	struct bcma_device *core;



	/* Init CC core */

	core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);

	if (core) {

		bus->drv_cc.setup_done = false;

		bcma_core_chipcommon_init(&bus->drv_cc);

	}



	return 0;

}

#endif



int __bcma_driver_register(struct bcma_driver *drv, struct module *owner)

{

	drv->drv.name = drv->name;

drivers/bcma/sprom.c

+61 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) 
	u16 v;

	int i;



	bus->sprom.revision = sprom[SSB_SPROMSIZE_WORDS_R4 - 1] &

		SSB_SPROM_REVISION_REV;



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

		v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];

		*(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);
@@ -136,12 +139,70 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) 


	bus->sprom.board_rev = sprom[SPOFF(SSB_SPROM8_BOARDREV)];



	bus->sprom.txpid2g[0] = (sprom[SPOFF(SSB_SPROM4_TXPID2G01)] &

	     SSB_SPROM4_TXPID2G0) >> SSB_SPROM4_TXPID2G0_SHIFT;

	bus->sprom.txpid2g[1] = (sprom[SPOFF(SSB_SPROM4_TXPID2G01)] &

	     SSB_SPROM4_TXPID2G1) >> SSB_SPROM4_TXPID2G1_SHIFT;

	bus->sprom.txpid2g[2] = (sprom[SPOFF(SSB_SPROM4_TXPID2G23)] &

	     SSB_SPROM4_TXPID2G2) >> SSB_SPROM4_TXPID2G2_SHIFT;

	bus->sprom.txpid2g[3] = (sprom[SPOFF(SSB_SPROM4_TXPID2G23)] &

	     SSB_SPROM4_TXPID2G3) >> SSB_SPROM4_TXPID2G3_SHIFT;



	bus->sprom.txpid5gl[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL01)] &

	     SSB_SPROM4_TXPID5GL0) >> SSB_SPROM4_TXPID5GL0_SHIFT;

	bus->sprom.txpid5gl[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL01)] &

	     SSB_SPROM4_TXPID5GL1) >> SSB_SPROM4_TXPID5GL1_SHIFT;

	bus->sprom.txpid5gl[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL23)] &

	     SSB_SPROM4_TXPID5GL2) >> SSB_SPROM4_TXPID5GL2_SHIFT;

	bus->sprom.txpid5gl[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5GL23)] &

	     SSB_SPROM4_TXPID5GL3) >> SSB_SPROM4_TXPID5GL3_SHIFT;



	bus->sprom.txpid5g[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5G01)] &

	     SSB_SPROM4_TXPID5G0) >> SSB_SPROM4_TXPID5G0_SHIFT;

	bus->sprom.txpid5g[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5G01)] &

	     SSB_SPROM4_TXPID5G1) >> SSB_SPROM4_TXPID5G1_SHIFT;

	bus->sprom.txpid5g[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5G23)] &

	     SSB_SPROM4_TXPID5G2) >> SSB_SPROM4_TXPID5G2_SHIFT;

	bus->sprom.txpid5g[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5G23)] &

	     SSB_SPROM4_TXPID5G3) >> SSB_SPROM4_TXPID5G3_SHIFT;



	bus->sprom.txpid5gh[0] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH01)] &

	     SSB_SPROM4_TXPID5GH0) >> SSB_SPROM4_TXPID5GH0_SHIFT;

	bus->sprom.txpid5gh[1] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH01)] &

	     SSB_SPROM4_TXPID5GH1) >> SSB_SPROM4_TXPID5GH1_SHIFT;

	bus->sprom.txpid5gh[2] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH23)] &

	     SSB_SPROM4_TXPID5GH2) >> SSB_SPROM4_TXPID5GH2_SHIFT;

	bus->sprom.txpid5gh[3] = (sprom[SPOFF(SSB_SPROM4_TXPID5GH23)] &

	     SSB_SPROM4_TXPID5GH3) >> SSB_SPROM4_TXPID5GH3_SHIFT;



	bus->sprom.boardflags_lo = sprom[SPOFF(SSB_SPROM8_BFLLO)];

	bus->sprom.boardflags_hi = sprom[SPOFF(SSB_SPROM8_BFLHI)];

	bus->sprom.boardflags2_lo = sprom[SPOFF(SSB_SPROM8_BFL2LO)];

	bus->sprom.boardflags2_hi = sprom[SPOFF(SSB_SPROM8_BFL2HI)];



	bus->sprom.country_code = sprom[SPOFF(SSB_SPROM8_CCODE)];



	bus->sprom.fem.ghz2.tssipos = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &

		SSB_SROM8_FEM_TSSIPOS) >> SSB_SROM8_FEM_TSSIPOS_SHIFT;

	bus->sprom.fem.ghz2.extpa_gain = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &

		SSB_SROM8_FEM_EXTPA_GAIN) >> SSB_SROM8_FEM_EXTPA_GAIN_SHIFT;

	bus->sprom.fem.ghz2.pdet_range = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &

		SSB_SROM8_FEM_PDET_RANGE) >> SSB_SROM8_FEM_PDET_RANGE_SHIFT;

	bus->sprom.fem.ghz2.tr_iso = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &

		SSB_SROM8_FEM_TR_ISO) >> SSB_SROM8_FEM_TR_ISO_SHIFT;

	bus->sprom.fem.ghz2.antswlut = (sprom[SPOFF(SSB_SPROM8_FEM2G)] &

		SSB_SROM8_FEM_ANTSWLUT) >> SSB_SROM8_FEM_ANTSWLUT_SHIFT;



	bus->sprom.fem.ghz5.tssipos = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &

		SSB_SROM8_FEM_TSSIPOS) >> SSB_SROM8_FEM_TSSIPOS_SHIFT;

	bus->sprom.fem.ghz5.extpa_gain = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &

		SSB_SROM8_FEM_EXTPA_GAIN) >> SSB_SROM8_FEM_EXTPA_GAIN_SHIFT;

	bus->sprom.fem.ghz5.pdet_range = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &

		SSB_SROM8_FEM_PDET_RANGE) >> SSB_SROM8_FEM_PDET_RANGE_SHIFT;

	bus->sprom.fem.ghz5.tr_iso = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &

		SSB_SROM8_FEM_TR_ISO) >> SSB_SROM8_FEM_TR_ISO_SHIFT;

	bus->sprom.fem.ghz5.antswlut = (sprom[SPOFF(SSB_SPROM8_FEM5G)] &

		SSB_SROM8_FEM_ANTSWLUT) >> SSB_SROM8_FEM_ANTSWLUT_SHIFT;

}



int bcma_sprom_get(struct bcma_bus *bus)

drivers/net/wireless/ath/ath.h

+6 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ struct ath_common { 
	struct ath_cycle_counters cc_survey;



	struct ath_regulatory regulatory;

	struct ath_regulatory reg_world_copy;

	const struct ath_ops *ops;

	const struct ath_bus_ops *bus_ops;
@@ -214,6 +215,10 @@ do { \ 
 * @ATH_DBG_HWTIMER: hardware timer handling

 * @ATH_DBG_BTCOEX: bluetooth coexistance

 * @ATH_DBG_BSTUCK: stuck beacons

 * @ATH_DBG_MCI: Message Coexistence Interface, a private protocol

 *	used exclusively for WLAN-BT coexistence starting from

 *	AR9462.

 * @ATH_DBG_DFS: radar datection

 * @ATH_DBG_ANY: enable all debugging

 *

 * The debug level is used to control the amount and type of debugging output
@@ -240,6 +245,7 @@ enum ATH_DEBUG { 
	ATH_DBG_WMI		= 0x00004000,

	ATH_DBG_BSTUCK		= 0x00008000,

	ATH_DBG_MCI		= 0x00010000,

	ATH_DBG_DFS		= 0x00020000,

	ATH_DBG_ANY		= 0xffffffff

};