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

Commit 5bdf502d 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 bf0098f2 38141fcf

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7509,6 +7509,12 @@ S: Maintained 
F:	Documentation/usb/acm.txt

F:	drivers/usb/class/cdc-acm.*



USB AR5523 WIRELESS DRIVER

M:	Pontus Fuchs <pontus.fuchs@gmail.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/ath/ar5523/



USB ATTACHED SCSI

M:	Matthew Wilcox <willy@linux.intel.com>

M:	Sarah Sharp <sarah.a.sharp@linux.intel.com>

arch/mips/bcm47xx/nvram.c

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ static void early_nvram_init(void) 
#ifdef CONFIG_BCM47XX_SSB

	case BCM47XX_BUS_TYPE_SSB:

		mcore_ssb = &bcm47xx_bus.ssb.mipscore;

		base = mcore_ssb->flash_window;

		lim = mcore_ssb->flash_window_size;

		base = mcore_ssb->pflash.window;

		lim = mcore_ssb->pflash.window_size;

		break;

#endif

#ifdef CONFIG_BCM47XX_BCMA

arch/mips/bcm47xx/wgt634u.c

+4 −4
Original line number Diff line number Diff line
@@ -156,10 +156,10 @@ static int __init wgt634u_init(void) 
					    SSB_CHIPCO_IRQ_GPIO);

		}



		wgt634u_flash_data.width = mcore->flash_buswidth;

		wgt634u_flash_resource.start = mcore->flash_window;

		wgt634u_flash_resource.end = mcore->flash_window

					   + mcore->flash_window_size

		wgt634u_flash_data.width = mcore->pflash.buswidth;

		wgt634u_flash_resource.start = mcore->pflash.window;

		wgt634u_flash_resource.end = mcore->pflash.window

					   + mcore->pflash.window_size

					   - 1;

		return platform_add_devices(wgt634u_devices,

					    ARRAY_SIZE(wgt634u_devices));

drivers/bcma/driver_chipcommon.c

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

}



void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)

void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)

{

	u32 leddc_on = 10;

	u32 leddc_off = 90;



	if (cc->setup_done)

	if (cc->early_setup_done)

		return;



	if (cc->core->id.rev >= 11)
@@ -36,6 +33,22 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc) 
	if (cc->core->id.rev >= 35)

		cc->capabilities_ext = bcma_cc_read32(cc, BCMA_CC_CAP_EXT);



	if (cc->capabilities & BCMA_CC_CAP_PMU)

		bcma_pmu_early_init(cc);



	cc->early_setup_done = true;

}



void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)

{

	u32 leddc_on = 10;

	u32 leddc_off = 90;



	if (cc->setup_done)

		return;



	bcma_core_chipcommon_early_init(cc);



	if (cc->core->id.rev >= 20) {

		bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, 0);

		bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, 0);

drivers/bcma/driver_chipcommon_nflash.c

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ int bcma_nflash_init(struct bcma_drv_cc *cc) 
	}



	cc->nflash.present = true;

	if (cc->core->id.rev == 38 &&

	    (cc->status & BCMA_CC_CHIPST_5357_NAND_BOOT))

		cc->nflash.boot = true;



	/* Prepare platform device, but don't register it yet. It's too early,

	 * malloc (required by device_private_init) is not available yet. */