From patchwork Wed Dec 23 08:35:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uri Mashiach X-Patchwork-Id: 7909281 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 28904BEEE5 for ; Wed, 23 Dec 2015 08:36:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B05A20431 for ; Wed, 23 Dec 2015 08:36:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BA6120444 for ; Wed, 23 Dec 2015 08:36:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964817AbbLWIgM (ORCPT ); Wed, 23 Dec 2015 03:36:12 -0500 Received: from softlayer.compulab.co.il ([50.23.254.55]:59230 "EHLO compulab.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755735AbbLWIfx (ORCPT ); Wed, 23 Dec 2015 03:35:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=compulab.co.il; s=default; h=References:In-Reply-To:Message-Id:Date:Subject :Cc:To:From; bh=EsRYji2ux1JIlIrANe9acik7hqnJdo+8/AuFNe/E/ec=; b=cf2EsVZTSs0xG cXgxJjwhgqAQT1yY4WVZbvuvndBhxFd3yv2JjIoKOu2q1UJo5jazFcO2qVgTj6wGwVdYPe1KyhdG3 Zx2QFs8KNPQ+ao2/E8XiCf8eOtz5fakHc7/yu42fBJXF8fgENBs9KCxS/zcgFyBURVqje/aGMc2mK u2zI=; Received: from [82.166.188.245] (port=54689 helo=zimbra-mta.compulab.co.il) by softlayer.compulab.co.il with esmtp (Exim 4.86) (envelope-from ) id 1aBetj-0002Ra-4J; Wed, 23 Dec 2015 10:35:51 +0200 Received: from localhost (localhost [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id B9AFE4834BB; Wed, 23 Dec 2015 10:35:49 +0200 (IST) Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 4Tpoa32H--Wf; Wed, 23 Dec 2015 10:35:48 +0200 (IST) Received: from localhost (localhost [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id B45774834B0; Wed, 23 Dec 2015 10:35:48 +0200 (IST) X-Virus-Scanned: amavisd-new at zimbra-mta.compulab.co.il Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id lu21XxDUVlDF; Wed, 23 Dec 2015 10:35:48 +0200 (IST) Received: from urim-desk.compulab.local (uri-ipc.compulab.local [192.168.11.218]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 83CB94834BB; Wed, 23 Dec 2015 10:35:48 +0200 (IST) From: Uri Mashiach To: Kalle Valo , Rob Herring , Tony Lindgren Cc: Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , bcousson@baylibre.com, Igor Grinberg , Eliad Peller , devicetree@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-wireless@vger.kernel.org, Uri Mashiach Subject: [PATCH 2/3] wlcore/wl12xx: spi: add device tree support Date: Wed, 23 Dec 2015 10:35:43 +0200 Message-Id: <1450859744-9948-3-git-send-email-uri.mashiach@compulab.co.il> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1450859744-9948-1-git-send-email-uri.mashiach@compulab.co.il> References: <1450859744-9948-1-git-send-email-uri.mashiach@compulab.co.il> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - softlayer.compulab.co.il X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Get-Message-Sender-Via: softlayer.compulab.co.il: acl_c_recent_authed_mail_ips_text_entry: uri.mashiach@compulab.co.il|compulab.co.il X-Authenticated-Sender: softlayer.compulab.co.il: uri.mashiach@compulab.co.il Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add DT support for the wl1271 SPI WiFi. Add documentation file for the wl1271 SPI WiFi. Signed-off-by: Uri Mashiach Acked-by: Igor Grinberg Acked-by: Rob Herring --- .../bindings/net/wireless/ti,wlcore,spi.txt | 35 +++++++++++ drivers/net/wireless/ti/wlcore/spi.c | 67 +++++++++++++++++++--- 2 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt diff --git a/Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt b/Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt new file mode 100644 index 0000000..a3e7eb7 --- /dev/null +++ b/Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt @@ -0,0 +1,35 @@ +* Texas Instruments wl1271 wireless lan controller + +The wl1271 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,wl1271" +- reg : Chip select address of device +- spi-max-frequency : Maximum SPI clocking speed of device in Hz +- ref-clock-frequency : Reference clock frequency +- interrupts : Should contain interrupt line and trigger type +- interrupt-parent : Should be the phandle for the interrupt controller + that services interrupts for this device +- vwlan-supply : Point the node of the regulator that controls the wl1271 chip WLAN_EN pin + +Optional properties: +- clock-xtal : boolean, clock is generated from XTAL + +- Please consult Documentation/devicetree/bindings/spi/spi-bus.txt + for optional SPI connection related properties, + +Examples: + +&spi1 { + wl1271@1 { + compatible = "ti,wl1271"; + + reg = <1>; + spi-max-frequency = <48000000>; + clock-xtal; + interrupt-parent = <&gpio3>; + interrupts = <8 IRQ_TYPE_LEVEL_HIGH>; + wifi-supply = <&wifi_fixed>; + }; +}; diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c index d3a4bcb..7281f5a 100644 --- a/drivers/net/wireless/ti/wlcore/spi.c +++ b/drivers/net/wireless/ti/wlcore/spi.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include "wlcore.h" @@ -357,6 +358,54 @@ static struct wl1271_if_operations spi_ops = { .set_block_size = NULL, }; +#ifdef CONFIG_OF +static const struct of_device_id wlcore_spi_of_match_table[] = { + { .compatible = "ti,wl1271" }, + { } +}; + +/** + * wlcore_probe_of - DT node parsing. + * @spi: SPI slave device parameters. + * @res: resource parameters. + * @glue: wl12xx SPI bus to slave device glue parameters. + * @pdev_data: wlcore device parameters + */ +static int wlcore_probe_of(struct spi_device *spi, struct resource *res, + struct wl12xx_spi_glue *glue, + struct wlcore_platdev_data *pdev_data) +{ + struct device_node *dt_node = spi->dev.of_node; + int ret; + + ret = of_irq_to_resource(dt_node, 0, &res[0]); + if (spi->irq != ret) { + dev_err(glue->dev, "can't get interrupt resource\n"); + return -EINVAL; + } + + if (of_find_property(dt_node, "clock-xtal", NULL)) + pdev_data->ref_clock_xtal = true; + + ret = of_property_read_u32(dt_node, "ref-clock-frequency", + &pdev_data->ref_clock_freq); + if (IS_ERR_VALUE(ret)) { + dev_err(glue->dev, + "can't get reference clock frequency (%d)\n", ret); + return ret; + } + + return 0; +} +#else /* CONFIG_OF */ +static int wlcore_probe_of(struct spi_device *spi, struct resource *res, + struct wl12xx_spi_glue *glue, + struct wlcore_platdev_data *pdev_data) +{ + return -ENODATA; +} +#endif /* CONFIG_OF */ + static int wl1271_probe(struct spi_device *spi) { struct wl12xx_spi_glue *glue; @@ -365,8 +414,7 @@ static int wl1271_probe(struct spi_device *spi) int ret; memset(&pdev_data, 0x00, sizeof(pdev_data)); - - /* TODO: add DT parsing when needed */ + memset(res, 0x00, sizeof(res)); pdev_data.if_ops = &spi_ops; @@ -390,6 +438,13 @@ static int wl1271_probe(struct spi_device *spi) return PTR_ERR(glue->reg); } + ret = wlcore_probe_of(spi, &res[0], glue, &pdev_data); + if (IS_ERR_VALUE(ret)) { + dev_err(glue->dev, + "can't get device tree parameters (%d)\n", ret); + return ret; + } + ret = spi_setup(spi); if (ret < 0) { dev_err(glue->dev, "spi_setup failed\n"); @@ -404,10 +459,6 @@ static int wl1271_probe(struct spi_device *spi) glue->core->dev.parent = &spi->dev; - memset(res, 0x00, sizeof(res)); - - res[0].start = spi->irq; - res[0].flags = IORESOURCE_IRQ; res[0].name = "irq"; ret = platform_device_add_resources(glue->core, res, ARRAY_SIZE(res)); @@ -445,10 +496,12 @@ static int wl1271_remove(struct spi_device *spi) return 0; } - static struct spi_driver wl1271_spi_driver = { .driver = { .name = "wl1271_spi", +#ifdef CONFIG_OF + .of_match_table = of_match_ptr(wlcore_spi_of_match_table), +#endif /* CONFIG_OF */ }, .probe = wl1271_probe,