From patchwork Mon Feb 8 10:15:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 8247521 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 30C419F3CD for ; Mon, 8 Feb 2016 10:19:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1501F20390 for ; Mon, 8 Feb 2016 10:19:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08A50201C8 for ; Mon, 8 Feb 2016 10:19:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752167AbcBHKTY (ORCPT ); Mon, 8 Feb 2016 05:19:24 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:39479 "EHLO mx0a-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751956AbcBHKTW (ORCPT ); Mon, 8 Feb 2016 05:19:22 -0500 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.15.0.59/8.15.0.59) with SMTP id u18AF8TG010298; Mon, 8 Feb 2016 02:19:21 -0800 Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 20xah51adt-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 08 Feb 2016 02:19:21 -0800 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1104.5; Mon, 8 Feb 2016 02:19:20 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1104.5 via Frontend Transport; Mon, 8 Feb 2016 02:19:20 -0800 Received: from pe-lt101 (unknown [10.31.130.183]) by maili.marvell.com (Postfix) with ESMTP id EAC183F703F; Mon, 8 Feb 2016 02:19:19 -0800 (PST) Received: from pe-lt101 (pe-lt077 [127.0.0.1]) by pe-lt101 (8.14.4/8.14.4) with ESMTP id u18AFgFK017518; Mon, 8 Feb 2016 02:15:42 -0800 Received: (from root@localhost) by pe-lt101 (8.14.4/8.14.4/Submit) id u18AFgBn017517; Mon, 8 Feb 2016 02:15:42 -0800 From: Amitkumar Karwar To: CC: Nishant Sarmukadam , , , Xinming Hu , Amitkumar Karwar Subject: [PATCH v3 3/3] mwifiex: parse host wakeup configuration from device tree Date: Mon, 8 Feb 2016 02:15:28 -0800 Message-ID: <1454926528-17480-3-git-send-email-akarwar@marvell.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1454926528-17480-1-git-send-email-akarwar@marvell.com> References: <1454926528-17480-1-git-send-email-akarwar@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-02-08_05:, , signatures=0 X-Proofpoint-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1601100000 definitions=main-1602080187 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 From: Xinming Hu This patch implement a framework for board specific wakeup. driver parse irq/gpio number from device tree, corresponding resources will be allocated, and used for host suspend/resume. driver private binding file is also updated in the patch. Signed-off-by: Xinming Hu Signed-off-by: Amitkumar Karwar --- v2: Guarded ".pm = mwifiex_plt_pm_ops" line with CONFIG_PM_SLEEP --- Documentation/devicetree/bindings/mwifiex.txt | 10 +++ .../net/wireless/marvell/mwifiex/platform_drv.c | 95 ++++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/Documentation/devicetree/bindings/mwifiex.txt b/Documentation/devicetree/bindings/mwifiex.txt index 367c97e..68919c7 100644 --- a/Documentation/devicetree/bindings/mwifiex.txt +++ b/Documentation/devicetree/bindings/mwifiex.txt @@ -14,6 +14,11 @@ Optional properties: - mwifiex,chip-gpio : Chip's wakeup gpio pin number. This needs to be downloaded to to firmware. Chip notifies wifi wakeup signal to SOC through this pin. + - interrupt-parent: phandle of the parent interrupt controller + - interrupts : interrupt number to the cpu + - gpios: specify SOC's wakeup GPIO + - pinctrl-names : a pinctrl state named "default" must be defined + - pinctrl-0 : pin control group to be used for this controller Example: @@ -27,5 +32,10 @@ mwifiex { mwifiex,caldata_00_txpwrlimit_2g_cfg_set = /bits/ 8 < 0x01 0x00 0x06 0x00 0x08 0x02 0x89 0x01 ...>; mwifiex,chip-gpio = <3>; + interrupt-parent = <&pio>; + interrupts = <38 IRQ_TYPE_LEVEL_LOW>; + gpios = <&pio 38 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&wake_pins>; }; diff --git a/drivers/net/wireless/marvell/mwifiex/platform_drv.c b/drivers/net/wireless/marvell/mwifiex/platform_drv.c index f64a12a..2eb813c 100644 --- a/drivers/net/wireless/marvell/mwifiex/platform_drv.c +++ b/drivers/net/wireless/marvell/mwifiex/platform_drv.c @@ -18,9 +18,63 @@ struct platform_device *mwifiex_plt_dev; +struct mwifiex_wake_dev { + struct device *dev; + int irq_wifi; + bool wake_by_wifi; +}; + +static irqreturn_t mwifiex_wake_irq_wifi(int irq, void *priv) +{ + struct mwifiex_wake_dev *ctx = priv; + + if (ctx->irq_wifi >= 0) { + ctx->wake_by_wifi = true; + disable_irq_nosync(ctx->irq_wifi); + } + + return IRQ_HANDLED; +} + static int mwifiex_plt_probe(struct platform_device *pdev) { + int ret; + struct mwifiex_wake_dev *ctx; + int gpio; + mwifiex_plt_dev = pdev; + + ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + + ctx->dev = &pdev->dev; + ctx->irq_wifi = platform_get_irq(pdev, 0); + if (ctx->irq_wifi < 0) + dev_err(&pdev->dev, "Failed to get irq_wifi\n"); + + gpio = of_get_gpio(pdev->dev.of_node, 0); + if (gpio_is_valid(gpio)) + gpio_direction_input(gpio); + else + dev_err(&pdev->dev, "gpio wifi is invalid\n"); + + if (ctx->irq_wifi >= 0) { + ret = devm_request_irq(&pdev->dev, ctx->irq_wifi, + mwifiex_wake_irq_wifi, + IRQF_TRIGGER_LOW, + "wifi_wake", ctx); + if (ret) { + dev_err(&pdev->dev, + "Failed to request irq_wifi %d (%d)\n", + ctx->irq_wifi, ret); + return -EINVAL; + } + disable_irq(ctx->irq_wifi); + } + + platform_set_drvdata(pdev, ctx); + return 0; } @@ -30,6 +84,44 @@ static int mwifiex_plt_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int mwifiex_plt_suspend(struct device *dev) +{ + struct mwifiex_wake_dev *ctx = dev_get_drvdata(dev); + int ret; + + if (ctx->irq_wifi >= 0) { + ctx->wake_by_wifi = false; + enable_irq(ctx->irq_wifi); + ret = enable_irq_wake(ctx->irq_wifi); + if (ret) + return ret; + } + + return 0; +} + +static int mwifiex_plt_resume(struct device *dev) +{ + struct mwifiex_wake_dev *ctx = dev_get_drvdata(dev); + int ret; + + if (ctx->irq_wifi >= 0) { + ret = disable_irq_wake(ctx->irq_wifi); + if (!ctx->wake_by_wifi) + disable_irq(ctx->irq_wifi); + if (ret) + return ret; + } + + return 0; +} + +static const struct dev_pm_ops mwifiex_plt_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(mwifiex_plt_suspend, mwifiex_plt_resume) +}; +#endif /* CONFIG_PM_SLEEP */ + static const struct of_device_id mwifiex_dt_match[] = { { .compatible = "marvell,mwifiex", @@ -45,6 +137,9 @@ static struct platform_driver mwifiex_platform_driver = { .driver = { .name = "mwifiex_plt", .of_match_table = mwifiex_dt_match, +#ifdef CONFIG_PM_SLEEP + .pm = &mwifiex_plt_pm_ops, +#endif } };