Commit 61f663df authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by John W. Linville
Browse files

brcmfmac: add device tree support for SDIO devices 



brcmfmac devices can use an out-of-band interrupt on a GPIO line.
Currently this is specified using platform data. Add support for
specifying out-of-band interrupt via device tree.

Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
[arend@broadcom.com: conditionalize more of-code, use driver debug routines]
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
[hdegoede@redhat.com: drop clk / reg_on gpio handling, as there is no consensus
 on how to handle this yet]
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1217dda7

drivers/net/wireless/brcm80211/brcmfmac/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -46,3 +46,5 @@ brcmfmac-$(CONFIG_BRCMDBG) += \ 
		dhd_dbg.o

brcmfmac-$(CONFIG_BRCM_TRACING) += \

		tracepoint.o

brcmfmac-$(CONFIG_OF) += \

		of.o

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "dhd_bus.h"

#include "dhd_dbg.h"

#include "sdio_host.h"

#include "of.h"



#define SDIOH_API_ACCESS_RETRY_LIMIT	2
@@ -1044,6 +1045,9 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
	sdiodev->dev = &sdiodev->func[1]->dev;

	sdiodev->pdata = brcmfmac_sdio_pdata;



	if (!sdiodev->pdata)

		brcmf_of_probe(sdiodev);



	atomic_set(&sdiodev->suspend, false);

	init_waitqueue_head(&sdiodev->request_word_wait);

	init_waitqueue_head(&sdiodev->request_buffer_wait);

drivers/net/wireless/brcm80211/brcmfmac/of.c

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014 Broadcom Corporation

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <linux/init.h>

#include <linux/of.h>

#include <linux/of_irq.h>

#include <linux/mmc/card.h>

#include <linux/platform_data/brcmfmac-sdio.h>

#include <linux/mmc/sdio_func.h>



#include <defs.h>

#include "dhd_dbg.h"

#include "sdio_host.h"



void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev)

{

	struct device *dev = sdiodev->dev;

	struct device_node *np = dev->of_node;

	int irq;

	u32 irqf;

	u32 val;



	if (!np || !of_device_is_compatible(np, "brcm,bcm4329-fmac"))

		return;



	sdiodev->pdata = devm_kzalloc(dev, sizeof(*sdiodev->pdata), GFP_KERNEL);

	if (!sdiodev->pdata)

		return;



	irq = irq_of_parse_and_map(np, 0);

	if (irq < 0) {

		brcmf_err("interrupt could not be mapped: err=%d\n", irq);

		devm_kfree(dev, sdiodev->pdata);

		return;

	}

	irqf = irqd_get_trigger_type(irq_get_irq_data(irq));



	sdiodev->pdata->oob_irq_supported = true;

	sdiodev->pdata->oob_irq_nr = irq;

	sdiodev->pdata->oob_irq_flags = irqf;



	if (of_property_read_u32(np, "brcm,drive-strength", &val) == 0)

		sdiodev->pdata->drive_strength = val;

}

drivers/net/wireless/brcm80211/brcmfmac/of.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014 Broadcom Corporation

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#ifdef CONFIG_OF

void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev);

#else

static void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev)

{

}

#endif /* CONFIG_OF */

CRA Git | Maintained and supported by SUSTech CRA and CCSE