Commit 42775a34 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

Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
parents 433131ba 4e3b3bcd

Documentation/DocBook/80211.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ 
!Finclude/net/cfg80211.h priv_to_wiphy

!Finclude/net/cfg80211.h set_wiphy_dev

!Finclude/net/cfg80211.h wdev_priv

!Finclude/net/cfg80211.h ieee80211_iface_limit

!Finclude/net/cfg80211.h ieee80211_iface_combination

      </chapter>

      <chapter>

      <title>Actions and configuration</title>

Documentation/devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ Your cooperation is appreciated. 
		133 = /dev/exttrp	External device trap

		134 = /dev/apm_bios	Advanced Power Management BIOS

		135 = /dev/rtc		Real Time Clock

		137 = /dev/vhci		Bluetooth virtual HCI driver

		139 = /dev/openprom	SPARC OpenBoot PROM

		140 = /dev/relay8	Berkshire Products Octal relay card

		141 = /dev/relay16	Berkshire Products ISO-16 relay card

Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
* Texas Instruments wl1251 wireless lan controller



The wl1251 chip can be connected via SPI or via SDIO. This

document describes the binding for the SPI connected chip.



Required properties:

- compatible :        Should be "ti,wl1251"

- reg :               Chip select address of device

- spi-max-frequency : Maximum SPI clocking speed of device in Hz

- interrupts :        Should contain interrupt line

- interrupt-parent :  Should be the phandle for the interrupt controller

                      that services interrupts for this device

- vio-supply :        phandle to regulator providing VIO

- ti,power-gpio :     GPIO connected to chip's PMEN pin



Optional properties:

- ti,wl1251-has-eeprom : boolean, the wl1251 has an eeprom connected, which

                         provides configuration data (calibration, MAC, ...)

- Please consult Documentation/devicetree/bindings/spi/spi-bus.txt

  for optional SPI connection related properties,



Examples:



&spi1 {

	wl1251@0 {

		compatible = "ti,wl1251";



		reg = <0>;

		spi-max-frequency = <48000000>;

		spi-cpol;

		spi-cpha;



		interrupt-parent = <&gpio2>;

		interrupts = <10 IRQ_TYPE_NONE>; /* gpio line 42 */



		vio-supply = <&vio>;

		ti,power-gpio = <&gpio3 23 GPIO_ACTIVE_HIGH>; /* 87 */

	};

};

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

+4 −2
Original line number Diff line number Diff line
@@ -536,11 +536,13 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { 


static void __init pandora_wl1251_init(void)

{

	struct wl12xx_platform_data pandora_wl1251_pdata;

	struct wl1251_platform_data pandora_wl1251_pdata;

	int ret;



	memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata));



	pandora_wl1251_pdata.power_gpio = -1;



	ret = gpio_request_one(PANDORA_WIFI_IRQ_GPIO, GPIOF_IN, "wl1251 irq");

	if (ret < 0)

		goto fail;
@@ -550,7 +552,7 @@ static void __init pandora_wl1251_init(void) 
		goto fail_irq;



	pandora_wl1251_pdata.use_eeprom = true;

	ret = wl12xx_set_platform_data(&pandora_wl1251_pdata);

	ret = wl1251_set_platform_data(&pandora_wl1251_pdata);

	if (ret < 0)

		goto fail_irq;

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

+3 −10
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ enum { 
	RX51_SPI_MIPID,		/* LCD panel */

};



static struct wl12xx_platform_data wl1251_pdata;

static struct wl1251_platform_data wl1251_pdata;

static struct tsc2005_platform_data tsc2005_pdata;



#if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE)
@@ -1173,13 +1173,7 @@ static inline void board_smc91x_init(void) 


#endif



static void rx51_wl1251_set_power(bool enable)

{

	gpio_set_value(RX51_WL1251_POWER_GPIO, enable);

}



static struct gpio rx51_wl1251_gpios[] __initdata = {

	{ RX51_WL1251_POWER_GPIO, GPIOF_OUT_INIT_LOW,	"wl1251 power"	},

	{ RX51_WL1251_IRQ_GPIO,	  GPIOF_IN,		"wl1251 irq"	},

};
@@ -1196,17 +1190,16 @@ static void __init rx51_init_wl1251(void) 
	if (irq < 0)

		goto err_irq;



	wl1251_pdata.set_power = rx51_wl1251_set_power;

	wl1251_pdata.power_gpio = RX51_WL1251_POWER_GPIO;

	rx51_peripherals_spi_board_info[RX51_SPI_WL1251].irq = irq;



	return;



err_irq:

	gpio_free(RX51_WL1251_IRQ_GPIO);

	gpio_free(RX51_WL1251_POWER_GPIO);

error:

	printk(KERN_ERR "wl1251 board initialisation failed\n");

	wl1251_pdata.set_power = NULL;

	wl1251_pdata.power_gpio = -1;



	/*

	 * Now rx51_peripherals_spi_board_info[1].irq is zero and