sunxi: drop 3.14 support

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 230-net-rfkill-changes.patch

diff --git a/target/linux/sunxi/patches-3.14/230-net-rfkill-changes.patch b/target/linux/sunxi/patches-3.14/230-net-rfkill-changes.patch
deleted file mode 100644 (file)
index d5e1078..0000000
--- a/target/linux/sunxi/patches-3.14/230-net-rfkill-changes.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 5f6f6af41e39677c9b722376a4088d10732cdd44 Mon Sep 17 00:00:00 2001
-From: Chen-Yu Tsai <wens@csie.org>
-Date: Fri, 17 Jan 2014 14:47:26 +0800
-Subject: [PATCH] net: rfkill: gpio: fix gpio name buffer size off by 1
-
-snprintf should be passed the complete size of the buffer, including
-the space for '\0'. The previous code resulted in the *_reset and
-*_shutdown strings being truncated.
-
-Signed-off-by: Chen-Yu Tsai <wens@csie.org>
----
- net/rfkill/rfkill-gpio.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/net/rfkill/rfkill-gpio.c
-+++ b/net/rfkill/rfkill-gpio.c
-@@ -26,6 +26,7 @@
- #include <linux/slab.h>
- #include <linux/acpi.h>
- #include <linux/gpio/consumer.h>
-+#include <linux/of_gpio.h>
- 
- #include <linux/rfkill-gpio.h>
- 
-@@ -39,6 +40,7 @@ struct rfkill_gpio_data {
-       char                    *reset_name;
-       char                    *shutdown_name;
-       struct clk              *clk;
-+      int                     clk_frequency;
- 
-       bool                    clk_enabled;
- };
-@@ -51,15 +53,15 @@ static int rfkill_gpio_set_power(void *d
-               gpiod_set_value(rfkill->shutdown_gpio, 0);
-               gpiod_set_value(rfkill->reset_gpio, 0);
-               if (!IS_ERR(rfkill->clk) && rfkill->clk_enabled)
--                      clk_disable(rfkill->clk);
-+                      clk_disable_unprepare(rfkill->clk);
-       } else {
-               if (!IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
--                      clk_enable(rfkill->clk);
-+                      clk_prepare_enable(rfkill->clk);
-               gpiod_set_value(rfkill->reset_gpio, 1);
-               gpiod_set_value(rfkill->shutdown_gpio, 1);
-       }
- 
--      rfkill->clk_enabled = blocked;
-+      rfkill->clk_enabled = !blocked;
- 
-       return 0;
- }
-@@ -83,6 +85,19 @@ static int rfkill_gpio_acpi_probe(struct
-       return 0;
- }
- 
-+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);
-+      of_property_read_u32(np, "clock-frequency", &rfkill->clk_frequency);
-+
-+      return 0;
-+}
-+
- static int rfkill_gpio_probe(struct platform_device *pdev)
- {
-       struct rfkill_gpio_platform_data *pdata = pdev->dev.platform_data;
-@@ -100,6 +115,10 @@ static int rfkill_gpio_probe(struct plat
-               ret = rfkill_gpio_acpi_probe(&pdev->dev, rfkill);
-               if (ret)
-                       return ret;
-+      } else 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;
-@@ -117,10 +136,12 @@ static int rfkill_gpio_probe(struct plat
-       if (!rfkill->shutdown_name)
-               return -ENOMEM;
- 
--      snprintf(rfkill->reset_name, len + 6 , "%s_reset", rfkill->name);
--      snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", rfkill->name);
-+      snprintf(rfkill->reset_name, len + 7 , "%s_reset", rfkill->name);
-+      snprintf(rfkill->shutdown_name, len + 10, "%s_shutdown", rfkill->name);
- 
-       rfkill->clk = devm_clk_get(&pdev->dev, clk_name);
-+      if (!IS_ERR(rfkill->clk) && rfkill->clk_frequency > 0)
-+              clk_set_rate(rfkill->clk, rfkill->clk_frequency);
- 
-       gpio = devm_gpiod_get_index(&pdev->dev, rfkill->reset_name, 0);
-       if (!IS_ERR(gpio)) {
-@@ -189,6 +210,11 @@ static const struct acpi_device_id rfkil
-       { },
- };
- 
-+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,
-@@ -196,6 +222,7 @@ static struct platform_driver rfkill_gpi
-               .name = "rfkill_gpio",
-               .owner = THIS_MODULE,
-               .acpi_match_table = ACPI_PTR(rfkill_acpi_match),
-+              .of_match_table = of_match_ptr(rfkill_of_match),
-       },
- };
- 
---- /dev/null
-+++ b/Documentation/devicetree/bindings/rfkill/rfkill-gpio.txt
-@@ -0,0 +1,28 @@
-+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
-+- NAME_shutdown-gpios : GPIO phandle to shutdown control
-+                        (phandle must be the second)
-+- NAME_reset-gpios    : GPIO phandle to reset control
-+
-+NAME must match the rfkill-name property. NAME_shutdown-gpios or
-+NAME_reset-gpios, or both, must be defined.
-+
-+Optional properties:
-+- clocks              : phandle to clock to enable/disable
-+- clock-frequency     : clock rate to set for the given clock
-+
-+Example:
-+
-+      rfkill_bt: rfkill@0 {
-+              compatible = "rfkill-gpio";
-+              rfkill-name = "bluetooth";
-+              rfkill-type = <2>;
-+              bluetooth_shutdown-gpios = <0>, <&pio 7 18 0>;
-+              bluetooth_reset-gpios = <&pio 7 24 0>;
-+              clocks = <&clk_out_a>;
-+              clock-frequency = <32678>;
-+      };