drop pinmux patch from 4.14 and 4.18

diff --git a/queue-4.14/pinctrl-pinmux-return-selector-to-the-pinctrl-driver.patch b/queue-4.14/pinctrl-pinmux-return-selector-to-the-pinctrl-driver.patch
deleted file mode 100644 (file)
index c8c881e..0000000
--- a/queue-4.14/pinctrl-pinmux-return-selector-to-the-pinctrl-driver.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From foo@baz Mon Sep 24 09:35:12 CEST 2018
-From: Tony Lindgren <tony@atomide.com>
-Date: Thu, 5 Jul 2018 02:10:15 -0700
-Subject: pinctrl: pinmux: Return selector to the pinctrl driver
-
-From: Tony Lindgren <tony@atomide.com>
-
-[ Upstream commit f913cfce4ee49a3382a9ff95696f49a46e56e974 ]
-
-We must return the selector from pinmux_generic_add_function() so
-pin controller device drivers can remove the right group if needed
-for deferred probe for example. And we now must make sure that a
-proper name is passed so we can use it to check if the entry already
-exists.
-
-Note that fixes are also needed for the pin controller drivers to
-use the selector value.
-
-Fixes: a76edc89b100 ("pinctrl: core: Add generic pinctrl functions for
-managing groups")
-Reported-by: H. Nikolaus Schaller <hns@goldelico.com>
-Cc: Christ van Willegen <cvwillegen@gmail.com>
-Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
-Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>
-Cc: Paul Cercueil <paul@crapouillou.net>
-Cc: Sean Wang <sean.wang@mediatek.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Tested-By: H. Nikolaus Schaller <hns@goldelico.com>
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pinctrl/pinmux.c |   16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
---- a/drivers/pinctrl/pinmux.c
-+++ b/drivers/pinctrl/pinmux.c
-@@ -308,7 +308,6 @@ static int pinmux_func_name_to_selector(
-               selector++;
-       }
- 
--      dev_err(pctldev->dev, "function '%s' not supported\n", function);
-       return -EINVAL;
- }
- 
-@@ -777,6 +776,16 @@ int pinmux_generic_add_function(struct p
-                               void *data)
- {
-       struct function_desc *function;
-+      int selector;
-+
-+      if (!name)
-+              return -EINVAL;
-+
-+      selector = pinmux_func_name_to_selector(pctldev, name);
-+      if (selector >= 0)
-+              return selector;
-+
-+      selector = pctldev->num_functions;
- 
-       function = devm_kzalloc(pctldev->dev, sizeof(*function), GFP_KERNEL);
-       if (!function)
-@@ -787,12 +796,11 @@ int pinmux_generic_add_function(struct p
-       function->num_group_names = num_groups;
-       function->data = data;
- 
--      radix_tree_insert(&pctldev->pin_function_tree, pctldev->num_functions,
--                        function);
-+      radix_tree_insert(&pctldev->pin_function_tree, selector, function);
- 
-       pctldev->num_functions++;
- 
--      return 0;
-+      return selector;
- }
- EXPORT_SYMBOL_GPL(pinmux_generic_add_function);
- 

diff --git a/queue-4.14/series b/queue-4.14/series
index 7c2dc0f5289a5c727b582e30c0b38f105a7be008..78e5708a7f348be8554d78800bc62a257e1170b3 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -117,7 +117,6 @@ security-check-for-kstrdup-failure-in-lsm_append.patch
 mips-loongson64-cs5536-fix-pci_ohci_int_reg-reads.patch
 configfs-fix-registered-group-removal.patch
 pinctrl-rza1-fix-selector-use-for-groups-and-functions.patch
-pinctrl-pinmux-return-selector-to-the-pinctrl-driver.patch
 sched-core-use-smp_mb-in-wake_woken_function.patch
 efi-esrt-only-call-efi_mem_reserve-for-boot-services-memory.patch
 arm-hisi-handle-of_iomap-and-fix-missing-of_node_put.patch

diff --git a/queue-4.18/pinctrl-pinmux-return-selector-to-the-pinctrl-driver.patch b/queue-4.18/pinctrl-pinmux-return-selector-to-the-pinctrl-driver.patch
deleted file mode 100644 (file)
index c89f452..0000000
--- a/queue-4.18/pinctrl-pinmux-return-selector-to-the-pinctrl-driver.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From foo@baz Mon Sep 24 09:45:39 CEST 2018
-From: Tony Lindgren <tony@atomide.com>
-Date: Thu, 5 Jul 2018 02:10:15 -0700
-Subject: pinctrl: pinmux: Return selector to the pinctrl driver
-
-From: Tony Lindgren <tony@atomide.com>
-
-[ Upstream commit f913cfce4ee49a3382a9ff95696f49a46e56e974 ]
-
-We must return the selector from pinmux_generic_add_function() so
-pin controller device drivers can remove the right group if needed
-for deferred probe for example. And we now must make sure that a
-proper name is passed so we can use it to check if the entry already
-exists.
-
-Note that fixes are also needed for the pin controller drivers to
-use the selector value.
-
-Fixes: a76edc89b100 ("pinctrl: core: Add generic pinctrl functions for
-managing groups")
-Reported-by: H. Nikolaus Schaller <hns@goldelico.com>
-Cc: Christ van Willegen <cvwillegen@gmail.com>
-Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
-Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>
-Cc: Paul Cercueil <paul@crapouillou.net>
-Cc: Sean Wang <sean.wang@mediatek.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Tested-By: H. Nikolaus Schaller <hns@goldelico.com>
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pinctrl/pinmux.c |   16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
---- a/drivers/pinctrl/pinmux.c
-+++ b/drivers/pinctrl/pinmux.c
-@@ -308,7 +308,6 @@ static int pinmux_func_name_to_selector(
-               selector++;
-       }
- 
--      dev_err(pctldev->dev, "function '%s' not supported\n", function);
-       return -EINVAL;
- }
- 
-@@ -775,6 +774,16 @@ int pinmux_generic_add_function(struct p
-                               void *data)
- {
-       struct function_desc *function;
-+      int selector;
-+
-+      if (!name)
-+              return -EINVAL;
-+
-+      selector = pinmux_func_name_to_selector(pctldev, name);
-+      if (selector >= 0)
-+              return selector;
-+
-+      selector = pctldev->num_functions;
- 
-       function = devm_kzalloc(pctldev->dev, sizeof(*function), GFP_KERNEL);
-       if (!function)
-@@ -785,12 +794,11 @@ int pinmux_generic_add_function(struct p
-       function->num_group_names = num_groups;
-       function->data = data;
- 
--      radix_tree_insert(&pctldev->pin_function_tree, pctldev->num_functions,
--                        function);
-+      radix_tree_insert(&pctldev->pin_function_tree, selector, function);
- 
-       pctldev->num_functions++;
- 
--      return 0;
-+      return selector;
- }
- EXPORT_SYMBOL_GPL(pinmux_generic_add_function);
- 

diff --git a/queue-4.18/series b/queue-4.18/series
index e08b126f8e87a9d6967be0026c4969b0232e072f..ac1112007ab11a25f2a91738e38871d3378f23e6 100644 (file)
--- a/queue-4.18/series
+++ b/queue-4.18/series
@@ -161,7 +161,6 @@ mips-loongson64-cs5536-fix-pci_ohci_int_reg-reads.patch
 configfs-fix-registered-group-removal.patch
 pinctrl-mt7622-fix-probe-fail-by-misuse-the-selector.patch
 pinctrl-rza1-fix-selector-use-for-groups-and-functions.patch
-pinctrl-pinmux-return-selector-to-the-pinctrl-driver.patch
 arm64-dts-mt7622-update-a-clock-property-for-uart0.patch
 sched-core-use-smp_mb-in-wake_woken_function.patch
 efi-esrt-only-call-efi_mem_reserve-for-boot-services-memory.patch