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

Commit 4d25a75b authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

parents 3549c6b1 9c3a8d99

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

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

		.deferred	= true,

	},

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	{

		.name		= "wl1271",

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

};



#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA



#define OMAP3EVM_WLAN_PMENA_GPIO	(150)

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

	OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |

				OMAP_PIN_OFF_NONE),

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	/* WLAN IRQ - GPIO 149 */

	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_BOOT5, 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 */

	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)

{

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	int ret;



	/* WL12xx WLAN Init */

drivers/net/wireless/ti/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -12,4 +12,13 @@ source "drivers/net/wireless/ti/wl18xx/Kconfig" 


# keep last for automatic dependencies

source "drivers/net/wireless/ti/wlcore/Kconfig"



config WILINK_PLATFORM_DATA

	bool "TI WiLink platform data"

	depends on WLCORE_SDIO || WL1251_SDIO

	default y

	---help---

	Small platform data bit needed to pass data to the sdio modules.





endif # WL_TI

drivers/net/wireless/ti/Makefile

+3 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_WLCORE)			+= wlcore/

obj-$(CONFIG_WL12XX)			+= wl12xx/

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wlcore/

obj-$(CONFIG_WL1251)			+= wl1251/

obj-$(CONFIG_WL18XX)			+= wl18xx/



# small builtin driver bit

obj-$(CONFIG_WILINK_PLATFORM_DATA)	+= wilink_platform_data.o

drivers/net/wireless/ti/wl12xx/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1703,7 +1703,8 @@ static struct ieee80211_sta_ht_cap wl12xx_ht_cap = { 
static int wl12xx_setup(struct wl1271 *wl)

{

	struct wl12xx_priv *priv = wl->priv;

	struct wl12xx_platform_data *pdata = wl->pdev->dev.platform_data;

	struct wlcore_platdev_data *pdev_data = wl->pdev->dev.platform_data;

	struct wl12xx_platform_data *pdata = pdev_data->pdata;



	wl->rtable = wl12xx_rtable;

	wl->num_tx_desc = WL12XX_NUM_TX_DESCRIPTORS;