net: rfkill: gpio: add device tree support

Change-Id: Ic179fcf929d3555a29addd39024011537ea041fa
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt b/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt
new file mode 100644 (file)
index 0000000..67b5edb
--- /dev/null
+++ b/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt
@@ -0,0 +1,26 @@
+GPIO controlled RFKILL devices
+
+Required properties:
+- compatible   : Must be "rfkill-gpio".
+- rfkill-name  : Name of RFKILL device
+- rfkill-type  : Type of RFKILL device: 1 for WiFi, 2 for BlueTooth, etc.
+                 See include/uapi/linux/rfkill.h for all valid values
+- gpios                : At most two GPIO phandles
+- gpio-names   : Shall be "reset" or "shutdown", matching gpios.
+                 If both are provided, the "reset" GPIO is toggled first.
+
+Optional properties:
+- clocks               : phandle to clock to enable/disable
+- clock-frequency      : desired clock rate for the given clock
+
+Example:
+
+       rfkill_bt {
+               compatible = "rfkill-gpio";
+               rfkill-name = "bluetooth";
+               rfkill-type = <2>;
+               gpios = <&pio 7 18 0>;
+               gpio-names = "reset";
+               clocks = <&clk_out_a>;
+               clock-frequency = <32678>;
+       };

diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index a5819f9..99c778c 100644 (file)
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
+#include <linux/of_gpio.h>
 
 #include <linux/rfkill-gpio.h>
 
@@ -70,6 +71,18 @@ static const struct rfkill_ops rfkill_gpio_ops = {
        .set_block = rfkill_gpio_set_power,
 };
 
+static int rfkill_gpio_dt_probe(struct device *dev,
+                               struct rfkill_gpio_data *rfkill)
+{
+       struct device_node * np = dev->of_node;
+
+       rfkill->name = np->name;
+       of_property_read_string(np, "rfkill-name", &rfkill->name);
+       of_property_read_u32(np, "rfkill-type", &rfkill->type);
+
+       return 0;
+}
+
 static int rfkill_gpio_probe(struct platform_device *pdev)
 {
        struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
@@ -82,7 +95,11 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
        if (!rfkill)
                return -ENOMEM;
 
-       if (pdata) {
+       if (&pdev->dev.of_node) {
+               ret = rfkill_gpio_dt_probe(&pdev->dev, rfkill);
+               if (ret)
+                       return ret;
+       } else if (pdata) {
                clk_name = pdata->power_clk_name;
                rfkill->name = pdata->name;
                rfkill->type = pdata->type;
@@ -170,12 +187,18 @@ static int rfkill_gpio_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct of_device_id rfkill_of_match[] = {
+       { .compatible = "rfkill-gpio", },
+       {},
+};
+
 static struct platform_driver rfkill_gpio_driver = {
        .probe = rfkill_gpio_probe,
        .remove = rfkill_gpio_remove,
        .driver = {
                .name = "rfkill_gpio",
                .owner = THIS_MODULE,
+               .of_match_table = of_match_ptr(rfkill_of_match),
        },
 };