From patchwork Sun Jan 18 05:16:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Green X-Patchwork-Id: 5652931 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 A3DE7C058D for ; Sun, 18 Jan 2015 05:17:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B31CA2037E for ; Sun, 18 Jan 2015 05:17:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7A892035B for ; Sun, 18 Jan 2015 05:17:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751401AbbARFQ7 (ORCPT ); Sun, 18 Jan 2015 00:16:59 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:60749 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751104AbbARFQ5 (ORCPT ); Sun, 18 Jan 2015 00:16:57 -0500 Received: by mail-pa0-f48.google.com with SMTP id rd3so32106095pab.7; Sat, 17 Jan 2015 21:16:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=sender:subject:from:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=Rfvj7EZni6Dtr6ffs7WAOfR99G/y3JSvcw1wezHJKa8=; b=Dm63GO7TwKYtrONWf5Ral3FqLC+K4V0qWnRghDCi4ZsDODu5BAIQ5BQKIXr00RHFh7 /c93Jdbf97hH0gO2XOAiU72srL3wYwAnIceXCXS+HOk3kk600WRO9oo+M9dj/zz8f4BE njCBz1s2IkLq/js5ZpfAAG2Np/5ZVPpoZ2Ru84uur4QPMbpu+0qmmiGVjT6F0NQmDU7j M2a34/In4qN2ay+R5Qn9V2VBUH4hBvLwRZxnyym8Pd/ZGegx0tVn7VVTAF7b4+smCyMR eT3R/TUmXdpPDeGJcfTo9VlPRXUmwD9AUiYvzVlRYm5BqlcFXo+wg0DOvCWXVHaZzdqL 1uLQ== X-Received: by 10.66.251.200 with SMTP id zm8mr7669561pac.72.1421558216835; Sat, 17 Jan 2015 21:16:56 -0800 (PST) Received: from warmcat.com (114-36-241-182.dynamic.hinet.net. [114.36.241.182]) by mx.google.com with ESMTPSA id uk5sm8074138pbc.17.2015.01.17.21.16.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Jan 2015 21:16:55 -0800 (PST) Subject: [PATCH 2/2] net wireless wcn36xx adapt wcnss platform to select module by DT From: Andy Green To: Kalle Valo , Eugene Krasnikov Cc: wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Date: Sun, 18 Jan 2015 13:16:52 +0800 Message-ID: <20150118051650.32019.49483.stgit@114-36-241-182.dynamic.hinet.net> In-Reply-To: <20150118051222.32019.32719.stgit@114-36-241-182.dynamic.hinet.net> References: <20150118051222.32019.32719.stgit@114-36-241-182.dynamic.hinet.net> User-Agent: StGit/0.17-dirty MIME-Version: 1.0 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,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 Simplify the resource handling and use DT to indicate which chip type we are dealing with Signed-off-by: Andy Green --- drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c | 101 ++++++++++++------------ 1 file changed, 52 insertions(+), 49 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c b/drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c index f6f6c83..c9250e0 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx-msm.c @@ -42,7 +42,10 @@ struct wcn36xx_msm { struct completion smd_compl; smd_channel_t *smd_ch; struct pinctrl *pinctrl; -} wmsm; + enum wcn36xx_chip_type chip_type; +}; + +static struct wcn36xx_msm wmsm; static int wcn36xx_msm_smsm_change_state(u32 clear_mask, u32 set_mask) { @@ -217,14 +220,47 @@ int wcn36xx_msm_powerup(const struct subsys_desc *desc) return 0; } +static const struct of_device_id wcn36xx_msm_match_table[] = { + { .compatible = "qcom,wcn3660", .data = (void *)WCN36XX_CHIP_3660 }, + { .compatible = "qcom,wcn3680", .data = (void *)WCN36XX_CHIP_3680 }, + { .compatible = "qcom,wcn3620", .data = (void *)WCN36XX_CHIP_3620 }, + { } +}; + +static int wcn36xx_msm_get_chip_type(void) +{ + return wmsm.chip_type; +} + +static struct wcn36xx_msm wmsm = { + .ctrl_ops = { + .open = wcn36xx_msm_smd_open, + .close = wcn36xx_msm_smd_close, + .tx = wcn36xx_msm_smd_send_and_wait, + .get_hw_mac = wcn36xx_msm_get_hw_mac, + .smsm_change_state = wcn36xx_msm_smsm_change_state, + .get_chip_type = wcn36xx_msm_get_chip_type, + }, +}; + static int wcn36xx_msm_probe(struct platform_device *pdev) { int ret; - struct resource *wcnss_memory; - struct resource *tx_irq; - struct resource *rx_irq; + const struct of_device_id *of_id; + struct resource *r; struct resource res[3]; struct pinctrl_state *ps; + static const char const *rnames[] = { + "wcnss_mmio", "wcnss_wlantx_irq", "wcnss_wlanrx_irq" }; + static const int rtype[] = { + IORESOURCE_MEM, IORESOURCE_IRQ, IORESOURCE_IRQ }; + int n; + + of_id = of_match_node(wcn36xx_msm_match_table, pdev->dev.of_node); + if (!of_id) + return -EINVAL; + + wmsm.chip_type = (enum wcn36xx_chip_type)of_id->data; wmsm.pinctrl = devm_pinctrl_get(&pdev->dev); if (IS_ERR_OR_NULL(wmsm.pinctrl)) @@ -240,52 +276,23 @@ static int wcn36xx_msm_probe(struct platform_device *pdev) if (IS_ERR_OR_NULL(pil)) pil = subsystem_get("wcnss"); - if (IS_ERR_OR_NULL(pil)) - return PTR_ERR(pil); + if (IS_ERR_OR_NULL(pil)) + return PTR_ERR(pil); wmsm.core = platform_device_alloc("wcn36xx", -1); - //dev_err(&pdev->dev, "%s starting\n", __func__); - - memset(res, 0x00, sizeof(res)); - wmsm.ctrl_ops.open = wcn36xx_msm_smd_open; - wmsm.ctrl_ops.close = wcn36xx_msm_smd_close; - wmsm.ctrl_ops.tx = wcn36xx_msm_smd_send_and_wait; - wmsm.ctrl_ops.get_hw_mac = wcn36xx_msm_get_hw_mac; - wmsm.ctrl_ops.smsm_change_state = wcn36xx_msm_smsm_change_state; - wcnss_memory = - platform_get_resource_byname(pdev, - IORESOURCE_MEM, - "wcnss_mmio"); - if (wcnss_memory == NULL) { - dev_err(&wmsm.core->dev, - "Failed to get wcnss wlan memory map.\n"); - ret = -ENOMEM; - return ret; - } - memcpy(&res[0], wcnss_memory, sizeof(*wcnss_memory)); - - tx_irq = platform_get_resource_byname(pdev, - IORESOURCE_IRQ, - "wcnss_wlantx_irq"); - if (tx_irq == NULL) { - dev_err(&wmsm.core->dev, "Failed to get wcnss tx_irq"); - ret = -ENOMEM; - return ret; - } - memcpy(&res[1], tx_irq, sizeof(*tx_irq)); - - rx_irq = platform_get_resource_byname(pdev, - IORESOURCE_IRQ, - "wcnss_wlanrx_irq"); - if (rx_irq == NULL) { - dev_err(&wmsm.core->dev, "Failed to get wcnss rx_irq"); - ret = -ENOMEM; - return ret; + for (n = 0; n < ARRAY_SIZE(rnames); n++) { + r = platform_get_resource_byname(pdev, rtype[n], rnames[n]); + if (!r) { + dev_err(&wmsm.core->dev, + "Missing resource %s'\n", rnames[n]); + ret = -ENOMEM; + return ret; + } + res[n] = *r; } - memcpy(&res[2], rx_irq, sizeof(*rx_irq)); - platform_device_add_resources(wmsm.core, res, ARRAY_SIZE(res)); + platform_device_add_resources(wmsm.core, res, n); ret = platform_device_add_data(wmsm.core, &wmsm.ctrl_ops, sizeof(wmsm.ctrl_ops)); @@ -319,10 +326,6 @@ static int wcn36xx_msm_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id wcn36xx_msm_match_table[] = { - { .compatible = "qcom,wcn36xx" }, - { } -}; MODULE_DEVICE_TABLE(of, wcn36xx_msm_match_table); static struct platform_driver wcn36xx_msm_driver = {