From patchwork Thu Sep 29 11:57:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sangwook X-Patchwork-Id: 4429 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 05D1923F57 for ; Thu, 29 Sep 2011 11:59:29 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id DB3E7A18438 for ; Thu, 29 Sep 2011 11:59:28 +0000 (UTC) Received: by fxe23 with SMTP id 23so2391884fxe.11 for ; Thu, 29 Sep 2011 04:59:28 -0700 (PDT) Received: by 10.223.45.140 with SMTP id e12mr9233743faf.27.1317297568058; Thu, 29 Sep 2011 04:59:28 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.3.234 with SMTP id f10cs12309laf; Thu, 29 Sep 2011 04:59:27 -0700 (PDT) Received: by 10.216.181.194 with SMTP id l44mr3221779wem.87.1317297564920; Thu, 29 Sep 2011 04:59:24 -0700 (PDT) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id o46si1040913weq.88.2011.09.29.04.59.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 29 Sep 2011 04:59:24 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of sangwook.lee@linaro.org) smtp.mail=sangwook.lee@linaro.org Received: by wyf23 with SMTP id 23so109266wyf.37 for ; Thu, 29 Sep 2011 04:59:24 -0700 (PDT) Received: by 10.216.134.168 with SMTP id s40mr1042893wei.50.1317297563914; Thu, 29 Sep 2011 04:59:23 -0700 (PDT) Received: from localhost.localdomain (host109-149-107-208.range109-149.btcentralplus.com. [109.149.107.208]) by mx.google.com with ESMTPS id i11sm2118507wbn.25.2011.09.29.04.59.21 (version=SSLv3 cipher=OTHER); Thu, 29 Sep 2011 04:59:22 -0700 (PDT) From: Sangwook Lee To: johannes@sipsolutions.net, rklein@nvidia.com Cc: linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, patches@linaro.org, Sangwook Lee Subject: [PATCH v3] net:rfkill: add a gpio setup function into GPIO rfkill Date: Thu, 29 Sep 2011 12:57:17 +0100 Message-Id: <1317297437-1155-1-git-send-email-sangwook.lee@linaro.org> X-Mailer: git-send-email 1.7.4.1 Add a gpio setup function which gives a chance to set up platform specific configuration such as pin multiplexing, input/output direction at the runtime or booting time. Signed-off-by: Sangwook Lee --- v3: add a gpio clean-up function into GPIO rfkill v2: - fixed the return type after checking gpio_runtime_setup include/linux/rfkill-gpio.h | 4 ++++ net/rfkill/rfkill-gpio.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/linux/rfkill-gpio.h b/include/linux/rfkill-gpio.h index a175d05..4d09f6e 100644 --- a/include/linux/rfkill-gpio.h +++ b/include/linux/rfkill-gpio.h @@ -30,6 +30,8 @@ * @reset_gpio: GPIO which is used for reseting rfkill switch * @shutdown_gpio: GPIO which is used for shutdown of rfkill switch * @power_clk_name: [optional] name of clk to turn off while blocked + * @gpio_runtime_close: clean up platform specific gpio configuration + * @gpio_runtime_setup: set up platform specific gpio configuration */ struct rfkill_gpio_platform_data { @@ -38,6 +40,8 @@ struct rfkill_gpio_platform_data { int shutdown_gpio; const char *power_clk_name; enum rfkill_type type; + void (*gpio_runtime_close)(struct platform_device *); + int (*gpio_runtime_setup)(struct platform_device *); }; #endif /* __RFKILL_GPIO_H */ diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 256c5dd..128677d 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -101,6 +101,14 @@ static int rfkill_gpio_probe(struct platform_device *pdev) if (!rfkill) return -ENOMEM; + if (pdata->gpio_runtime_setup) { + ret = pdata->gpio_runtime_setup(pdev); + if (ret) { + pr_warn("%s: can't set up gpio\n", __func__); + return ret; + } + } + rfkill->pdata = pdata; len = strlen(pdata->name); @@ -182,7 +190,10 @@ fail_alloc: static int rfkill_gpio_remove(struct platform_device *pdev) { struct rfkill_gpio_data *rfkill = platform_get_drvdata(pdev); + struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data; + if (pdata->gpio_runtime_close) + pdata->gpio_runtime_close(pdev); rfkill_unregister(rfkill->rfkill_dev); rfkill_destroy(rfkill->rfkill_dev); if (gpio_is_valid(rfkill->pdata->shutdown_gpio))