From b5e4cdca23effb9366fdea34e4ec9cc8827915a4 Mon Sep 17 00:00:00 2001
From: Sangwook Lee <sangwook.lee@linaro.org>
Date: Thu, 29 Sep 2011 12:57:17 +0100
Subject: [PATCH] --- yaml --- r: 266634 b: refs/heads/master c:
 e209c5a7ed1870ab7f112ad47083b5d616e8b6a4 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/include/linux/rfkill-gpio.h |  4 ++++
 trunk/net/rfkill/rfkill-gpio.c    | 11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a4a06ddeb16..75aba25db537 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 893d73f4a15bda966cb72f84897898eb235e134c
+refs/heads/master: e209c5a7ed1870ab7f112ad47083b5d616e8b6a4
diff --git a/trunk/include/linux/rfkill-gpio.h b/trunk/include/linux/rfkill-gpio.h
index a175d0598033..4d09f6eab359 100644
--- a/trunk/include/linux/rfkill-gpio.h
+++ b/trunk/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/trunk/net/rfkill/rfkill-gpio.c b/trunk/net/rfkill/rfkill-gpio.c
index 256c5ddd2d72..128677d69056 100644
--- a/trunk/net/rfkill/rfkill-gpio.c
+++ b/trunk/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 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
 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))