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 <[email protected]>
---
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))
--
1.7.4.1
Reference: Email from Sangwook Lee, 2011-09-29 to this list and to lkml, with this subject, see http://article.gmane.org/gmane.linux.kernel/1197024/
Now, when I compile compat-wireless-2011-11-03 on my G3 iBook (ppc32) against linux-3.1.0 (Fedora based kernel package 3.1.0-7.fc16.ppc), I get the following errors, so it seems that Lee's patch was not merged (yet), though those structs 'gpio_runtime_setup' and 'gpio_runtime_close' are used in the rfkill-gpio module:
CC [M] /home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill/rfkill-gpio.o
/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill/rfkill-gpio.c: In function 'rfkill_gpio_probe':
/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill/rfkill-gpio.c:104:11: error: 'struct rfkill_gpio_platform_data' has no member named 'gpio_runtime_setup'
/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill/rfkill-gpio.c:105:14: error: 'struct rfkill_gpio_platform_data' has no member named 'gpio_runtime_setup'
/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill/rfkill-gpio.c: In function 'rfkill_gpio_remove':
/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill/rfkill-gpio.c:195:11: error: 'struct rfkill_gpio_platform_data' has no member named 'gpio_runtime_close'
/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill/rfkill-gpio.c:196:8: error: 'struct rfkill_gpio_platform_data' has no member named 'gpio_runtime_close'
make[3]: *** [/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill/rfkill-gpio.o] Error 1
make[2]: *** [/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03/net/rfkill] Error 2
make[1]: *** [_module_/home/ingvar/src/compat-wireless-latest/compat-wireless-2011-11-03] Error 2
make[1]: Leaving directory `/usr/src/kernels/3.1.0-7.fc16.ppc'
make: *** [modules] Error 2
Adding Lee's patch (or even only the headers) seems to work.
Just fyi.
Ingvar