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

Commit b618f6f8 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-2.6 into for-davem

Conflicts:
	arch/arm/mach-omap2/board-omap3pandora.c
	drivers/net/wireless/ath/ath5k/base.c
parents 462fb2af 6e5c2b4e

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -1120,6 +1120,13 @@ W: http://wireless.kernel.org/en/users/Drivers/ar9170 
S:	Maintained

F:	drivers/net/wireless/ath/ar9170/



CARL9170 LINUX COMMUNITY WIRELESS DRIVER

M:	Christian Lamparter <chunkeey@googlemail.com>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/carl9170

S:	Maintained

F:	drivers/net/wireless/ath/carl9170/



ATK0110 HWMON DRIVER

M:	Luca Tettamanti <kronos.it@gmail.com>

L:	lm-sensors@lm-sensors.org
@@ -6427,7 +6434,7 @@ W: http://wireless.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/wl12xx/wl1271*

F:	include/linux/spi/wl12xx.h

F:	include/linux/wl12xx.h



WL3501 WIRELESS PCMCIA CARD DRIVER

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/spi/ads7846.h>

#include <linux/regulator/machine.h>

#include <linux/i2c/twl.h>

#include <linux/spi/wl12xx.h>

#include <linux/wl12xx.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/nand.h>

#include <linux/leds.h>

arch/arm/mach-omap2/board-rx51-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/input.h>

#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>

#include <linux/spi/wl12xx.h>

#include <linux/wl12xx.h>

#include <linux/i2c.h>

#include <linux/i2c/twl.h>

#include <linux/clk.h>

arch/arm/mach-omap2/board-zoom-peripherals.c

+54 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <linux/gpio.h>

#include <linux/i2c/twl.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>

#include <linux/wl12xx.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -27,6 +29,9 @@ 
#include "mux.h"

#include "hsmmc.h"



#define OMAP_ZOOM_WLAN_PMENA_GPIO	(101)

#define OMAP_ZOOM_WLAN_IRQ_GPIO		(162)



/* Zoom2 has Qwerty keyboard*/

static int board_keymap[] = {

	KEY(0, 0, KEY_E),
@@ -106,6 +111,11 @@ static struct regulator_consumer_supply zoom_vmmc2_supply = { 
	.supply		= "vmmc",

};



static struct regulator_consumer_supply zoom_vmmc3_supply = {

	.supply		= "vmmc",

	.dev_name	= "mmci-omap-hs.2",

};



/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */

static struct regulator_init_data zoom_vmmc1 = {

	.constraints = {
@@ -151,6 +161,38 @@ static struct regulator_init_data zoom_vsim = { 
	.consumer_supplies      = &zoom_vsim_supply,

};



static struct regulator_init_data zoom_vmmc3 = {

	.constraints = {

		.valid_ops_mask	= REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies = &zoom_vmmc3_supply,

};



static struct fixed_voltage_config zoom_vwlan = {

	.supply_name		= "vwl1271",

	.microvolts		= 1800000, /* 1.8V */

	.gpio			= OMAP_ZOOM_WLAN_PMENA_GPIO,

	.startup_delay		= 70000, /* 70msec */

	.enable_high		= 1,

	.enabled_at_boot	= 0,

	.init_data		= &zoom_vmmc3,

};



static struct platform_device omap_vwlan_device = {

	.name		= "reg-fixed-voltage",

	.id		= 1,

	.dev = {

		.platform_data	= &zoom_vwlan,

	},

};



struct wl12xx_platform_data omap_zoom_wlan_data __initdata = {

	.irq = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),

	/* ZOOM ref clock is 26 MHz */

	.board_ref_clock = 1,

};



static struct omap2_hsmmc_info mmc[] __initdata = {

	{

		.name		= "external",
@@ -168,6 +210,14 @@ static struct omap2_hsmmc_info mmc[] __initdata = { 
		.nonremovable	= true,

		.power_saving	= true,

	},

	{

		.name		= "wl1271",

		.mmc		= 3,

		.wires		= 4,

		.gpio_wp	= -EINVAL,

		.gpio_cd	= -EINVAL,

		.nonremovable	= true,

	},

	{}      /* Terminator */

};
@@ -279,7 +329,11 @@ static void enable_board_wakeup_source(void) 


void __init zoom_peripherals_init(void)

{

	if (wl12xx_set_platform_data(&omap_zoom_wlan_data))

		pr_err("error setting wl12xx data\n");



	omap_i2c_init();

	platform_device_register(&omap_vwlan_device);

	usb_musb_init(&musb_board_data);

	enable_board_wakeup_source();

}

drivers/net/wireless/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -50,5 +50,7 @@ obj-$(CONFIG_ATH_COMMON) += ath/ 
obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o



obj-$(CONFIG_WL12XX)	+= wl12xx/

# small builtin driver bit

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/wl12xx_platform_data.o



obj-$(CONFIG_IWM)	+= iwmc3200wifi/