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

Commit 197c6283 authored by Luciano Coelho's avatar Luciano Coelho
Browse files

wlcore_sdio/wl18xx: use SDIO revision number to identify wl18xx chips 



At least in PG1, the wl18xx chips use the same SDIO vendor/device ID,
so it's not possible to figure out which driver is to be used.  As a
workaround, we can check the SDIO revision number, because wl18xx uses
3.00 and wl12xx does not.

Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
parent 9a1a6990

drivers/net/wireless/ti/wlcore/sdio.c

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

#include <linux/vmalloc.h>

#include <linux/platform_device.h>

#include <linux/mmc/sdio.h>

#include <linux/mmc/sdio_func.h>

#include <linux/mmc/sdio_ids.h>

#include <linux/mmc/card.h>
@@ -196,6 +197,7 @@ static int __devinit wl1271_probe(struct sdio_func *func, 
	struct resource res[1];

	mmc_pm_flag_t mmcflags;

	int ret = -ENOMEM;

	const char *chip_family;



	/* We are only able to handle the wlan function */

	if (func->num != 0x02)
@@ -236,7 +238,18 @@ static int __devinit wl1271_probe(struct sdio_func *func, 
	/* Tell PM core that we don't need the card to be powered now */

	pm_runtime_put_noidle(&func->dev);



	glue->core = platform_device_alloc("wl12xx", -1);

	/*

	 * Due to a hardware bug, we can't differentiate wl18xx from

	 * wl12xx, because both report the same device ID.  The only

	 * way to differentiate is by checking the SDIO revision,

	 * which is 3.00 on the wl18xx chips.

	 */

	if (func->card->cccr.sdio_vsn == SDIO_SDIO_REV_3_00)

		chip_family = "wl18xx";

	else

		chip_family = "wl12xx";



	glue->core = platform_device_alloc(chip_family, -1);

	if (!glue->core) {

		dev_err(glue->dev, "can't allocate platform_device");

		ret = -ENOMEM;