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

Commit 78f42aee authored by Johannes Berg's avatar Johannes Berg
Browse files

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

parents aa5a1b8e 8708aac7

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/bcma/bcma_private.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ int bcma_sprom_get(struct bcma_bus *bus); 
/* driver_chipcommon.c */

#ifdef CONFIG_BCMA_DRIVER_MIPS

void bcma_chipco_serial_init(struct bcma_drv_cc *cc);

extern struct platform_device bcma_pflash_dev;

#endif /* CONFIG_BCMA_DRIVER_MIPS */



/* driver_chipcommon_pmu.c */

drivers/bcma/driver_chipcommon_nflash.c

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

 */



#include "bcma_private.h"



#include <linux/platform_device.h>

#include <linux/bcma/bcma.h>



#include "bcma_private.h"



struct platform_device bcma_nflash_dev = {

	.name		= "bcma_nflash",

	.num_resources	= 0,

drivers/bcma/driver_chipcommon_sflash.c

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

 */



#include "bcma_private.h"



#include <linux/platform_device.h>

#include <linux/bcma/bcma.h>



#include "bcma_private.h"



static struct resource bcma_sflash_resource = {

	.name	= "bcma_sflash",

	.start	= BCMA_SOC_FLASH2,

drivers/bcma/driver_gpio.c

+11 −0
Original line number Diff line number Diff line
@@ -73,6 +73,16 @@ static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio) 
	bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);

}



static int bcma_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);



	if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)

		return bcma_core_irq(cc->core);

	else

		return -EINVAL;

}



int bcma_gpio_init(struct bcma_drv_cc *cc)

{

	struct gpio_chip *chip = &cc->gpio;
@@ -85,6 +95,7 @@ int bcma_gpio_init(struct bcma_drv_cc *cc) 
	chip->set		= bcma_gpio_set_value;

	chip->direction_input	= bcma_gpio_direction_input;

	chip->direction_output	= bcma_gpio_direction_output;

	chip->to_irq		= bcma_gpio_to_irq;

	chip->ngpio		= 16;

	/* There is just one SoC in one device and its GPIO addresses should be

	 * deterministic to address them more easily. The other buses could get