diff mbox

[v2] net:rfkill: add a gpio setup function into GPIO rfkill

Message ID CADPsn1YbmMHrd99u=cvGO89=p5Y-sCP2KNFTDjx07CK1G5+V5A@mail.gmail.com
State Superseded
Headers show

Commit Message

Sangwook Sept. 26, 2011, 4:04 p.m. UTC 
---------- Forwarded message ----------
From: Sangwook Lee <sangwook.lee@linaro.org>
Date: 26 September 2011 16:43
Subject: [PATCH v2] net:rfkill: add a gpio setup function into GPIO rfkill
To: Rhyland Klein <rklein@nvidia.com>, Johannes Berg <
johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Sangwook
Lee <sangwook.lee@linaro.org>


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 <sangwook.lee@linaro.org>

v2:
- fixed the return type after checking gpio_runtime_setup
---
 include/linux/rfkill-gpio.h |    2 ++
 net/rfkill/rfkill-gpio.c    |    8 ++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

       len = strlen(pdata->name);
--
1.7.4.1
diff mbox

Patch

diff --git a/include/linux/rfkill-gpio.h b/include/linux/rfkill-gpio.h
index a175d05..786e7bb 100644
--- a/include/linux/rfkill-gpio.h
+++ b/include/linux/rfkill-gpio.h
@@ -30,6 +30,7 @@ 
 * @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_setup:        set up platform specific gpio configuration
 */

 struct rfkill_gpio_platform_data {
@@ -38,6 +39,7 @@  struct rfkill_gpio_platform_data {
       int                     shutdown_gpio;
       const char              *power_clk_name;
       enum rfkill_type        type;
+       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..96a910c 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;