From: Greg Kroah-Hartman Date: Tue, 25 Sep 2018 09:02:06 +0000 (+0200) Subject: drop pinmux patch from 4.14 and 4.18 X-Git-Tag: v3.18.123~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f11572923fa07e6c3bc040378d773f9dbc0585b1;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index c8c881ec9e8..00000000000 --- 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 -Date: Thu, 5 Jul 2018 02:10:15 -0700 -Subject: pinctrl: pinmux: Return selector to the pinctrl driver - -From: Tony Lindgren - -[ 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 -Cc: Christ van Willegen -Cc: Haojian Zhuang -Cc: Jacopo Mondi -Cc: Paul Cercueil -Cc: Sean Wang -Signed-off-by: Tony Lindgren -Tested-By: H. Nikolaus Schaller -Reviewed-by: Andy Shevchenko -Signed-off-by: Linus Walleij -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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 7c2dc0f5289..78e5708a7f3 100644 --- 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 index c89f452d35d..00000000000 --- 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 -Date: Thu, 5 Jul 2018 02:10:15 -0700 -Subject: pinctrl: pinmux: Return selector to the pinctrl driver - -From: Tony Lindgren - -[ 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 -Cc: Christ van Willegen -Cc: Haojian Zhuang -Cc: Jacopo Mondi -Cc: Paul Cercueil -Cc: Sean Wang -Signed-off-by: Tony Lindgren -Tested-By: H. Nikolaus Schaller -Reviewed-by: Andy Shevchenko -Signed-off-by: Linus Walleij -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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 e08b126f8e8..ac1112007ab 100644 --- 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