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

Commit 94d2f0ba authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

parents 5360cfb2 8457703f

arch/arm/mach-omap2/board-omap3evm.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -309,7 +309,7 @@ static struct omap2_hsmmc_info mmc[] = { 
		.gpio_wp	= 63,

		.gpio_wp	= 63,

		.deferred	= true,

		.deferred	= true,

	},

	},

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	{

	{

		.name		= "wl1271",

		.name		= "wl1271",

		.mmc		= 2,

		.mmc		= 2,
@@ -450,7 +450,7 @@ static struct regulator_init_data omap3evm_vio = { 
	.consumer_supplies	= omap3evm_vio_supply,

	.consumer_supplies	= omap3evm_vio_supply,

};

};





#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA





#define OMAP3EVM_WLAN_PMENA_GPIO	(150)

#define OMAP3EVM_WLAN_PMENA_GPIO	(150)

#define OMAP3EVM_WLAN_IRQ_GPIO		(149)

#define OMAP3EVM_WLAN_IRQ_GPIO		(149)
@@ -563,7 +563,7 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = { 
				OMAP_PIN_OFF_NONE),

				OMAP_PIN_OFF_NONE),

	OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |

	OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |

				OMAP_PIN_OFF_NONE),

				OMAP_PIN_OFF_NONE),

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	/* WLAN IRQ - GPIO 149 */

	/* WLAN IRQ - GPIO 149 */

	OMAP3_MUX(UART1_RTS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),

	OMAP3_MUX(UART1_RTS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
@@ -601,7 +601,7 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = { 
	OMAP3_MUX(SYS_BOOT4, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

	OMAP3_MUX(SYS_BOOT4, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

	OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

	OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

	OMAP3_MUX(SYS_BOOT6, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

	OMAP3_MUX(SYS_BOOT6, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	/* WLAN IRQ - GPIO 149 */

	/* WLAN IRQ - GPIO 149 */

	OMAP3_MUX(UART1_RTS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),

	OMAP3_MUX(UART1_RTS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
@@ -637,7 +637,7 @@ static struct gpio omap3_evm_ehci_gpios[] __initdata = { 




static void __init omap3_evm_wl12xx_init(void)

static void __init omap3_evm_wl12xx_init(void)

{

{

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	int ret;

	int ret;





	/* WL12xx WLAN Init */

	/* WL12xx WLAN Init */

drivers/bcma/driver_chipcommon_nflash.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -5,11 +5,11 @@ 
 * Licensed under the GNU/GPL. See COPYING for details.

 * Licensed under the GNU/GPL. See COPYING for details.

 */

 */





#include "bcma_private.h"



#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/bcma/bcma.h>

#include <linux/bcma/bcma.h>





#include "bcma_private.h"



struct platform_device bcma_nflash_dev = {

struct platform_device bcma_nflash_dev = {

	.name		= "bcma_nflash",

	.name		= "bcma_nflash",

	.num_resources	= 0,

	.num_resources	= 0,

drivers/bcma/driver_chipcommon_sflash.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -5,11 +5,11 @@ 
 * Licensed under the GNU/GPL. See COPYING for details.

 * Licensed under the GNU/GPL. See COPYING for details.

 */

 */





#include "bcma_private.h"



#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/bcma/bcma.h>

#include <linux/bcma/bcma.h>





#include "bcma_private.h"



static struct resource bcma_sflash_resource = {

static struct resource bcma_sflash_resource = {

	.name	= "bcma_sflash",

	.name	= "bcma_sflash",

	.start	= BCMA_SOC_FLASH2,

	.start	= BCMA_SOC_FLASH2,

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -1613,6 +1613,10 @@ ath5k_hw_update_noise_floor(struct ath5k_hw *ah) 
	ah->ah_cal_mask |= AR5K_CALIBRATION_NF;

	ah->ah_cal_mask |= AR5K_CALIBRATION_NF;





	ee_mode = ath5k_eeprom_mode_from_channel(ah->ah_current_channel);

	ee_mode = ath5k_eeprom_mode_from_channel(ah->ah_current_channel);

	if (WARN_ON(ee_mode < 0)) {

		ah->ah_cal_mask &= ~AR5K_CALIBRATION_NF;

		return;

	}





	/* completed NF calibration, test threshold */

	/* completed NF calibration, test threshold */

	nf = ath5k_hw_read_measured_noise_floor(ah);

	nf = ath5k_hw_read_measured_noise_floor(ah);

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -985,6 +985,8 @@ ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah, 
		return;

		return;





	ee_mode = ath5k_eeprom_mode_from_channel(channel);

	ee_mode = ath5k_eeprom_mode_from_channel(channel);

	if (WARN_ON(ee_mode < 0))

		return;





	/* Adjust power delta for channel 14 */

	/* Adjust power delta for channel 14 */

	if (channel->center_freq == 2484)

	if (channel->center_freq == 2484)