From: Greg Kroah-Hartman Date: Sat, 4 Jan 2020 11:58:23 +0000 (+0100) Subject: drop mfd-mfd-core-honour-device-tree-s-request-to-disable.patch from everywhere X-Git-Tag: v4.4.208~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b310a4a06c5d0531e16b08221e01bfb7a67d854;p=thirdparty%2Fkernel%2Fstable-queue.git drop mfd-mfd-core-honour-device-tree-s-request-to-disable.patch from everywhere --- diff --git a/queue-4.14/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch b/queue-4.14/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch deleted file mode 100644 index b7ef16823cf..00000000000 --- a/queue-4.14/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4e5cff956224a5cb9216206fb5ba973ea6b5529a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2019 11:19:50 +0000 -Subject: mfd: mfd-core: Honour Device Tree's request to disable a child-device - -From: Lee Jones - -[ Upstream commit 6b5c350648b857047b47acf74a57087ad27d6183 ] - -Until now, MFD has assumed all child devices passed to it (via -mfd_cells) are to be registered. It does not take into account -requests from Device Tree and the like to disable child devices -on a per-platform basis. - -Well now it does. - -Link: https://www.spinics.net/lists/arm-kernel/msg366309.html -Link: https://lkml.org/lkml/2019/8/22/1350 - -Reported-by: Barry Song -Reported-by: Stephan Gerhold -Reviewed-by: Daniel Thompson -Reviewed-by: Mark Brown -Tested-by: Stephan Gerhold -Signed-off-by: Lee Jones -Signed-off-by: Sasha Levin ---- - drivers/mfd/mfd-core.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c -index 5c8ed2150c8b..fae7bfe7a21a 100644 ---- a/drivers/mfd/mfd-core.c -+++ b/drivers/mfd/mfd-core.c -@@ -178,6 +178,11 @@ static int mfd_add_device(struct device *parent, int id, - if (parent->of_node && cell->of_compatible) { - for_each_child_of_node(parent->of_node, np) { - if (of_device_is_compatible(np, cell->of_compatible)) { -+ if (!of_device_is_available(np)) { -+ /* Ignore disabled devices error free */ -+ ret = 0; -+ goto fail_alias; -+ } - pdev->dev.of_node = np; - pdev->dev.fwnode = &np->fwnode; - break; --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index d8a7a98ffc0..466f3c3ebda 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -21,7 +21,6 @@ f2fs-fix-to-update-dir-s-i_pino-during-cross_rename.patch clk-qcom-allow-constant-ratio-freq-tables-for-rcg.patch irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch -mfd-mfd-core-honour-device-tree-s-request-to-disable.patch fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch scsi-lpfc-fix-coverity-lpfc_cmpl_els_rsp-null-pointe.patch scsi-ufs-fix-potential-bug-which-ends-in-system-hang.patch diff --git a/queue-4.19/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch b/queue-4.19/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch deleted file mode 100644 index 109d17c9839..00000000000 --- a/queue-4.19/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5431ded60a1249efb98425e22d09610930a3be17 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2019 11:19:50 +0000 -Subject: mfd: mfd-core: Honour Device Tree's request to disable a child-device - -From: Lee Jones - -[ Upstream commit 6b5c350648b857047b47acf74a57087ad27d6183 ] - -Until now, MFD has assumed all child devices passed to it (via -mfd_cells) are to be registered. It does not take into account -requests from Device Tree and the like to disable child devices -on a per-platform basis. - -Well now it does. - -Link: https://www.spinics.net/lists/arm-kernel/msg366309.html -Link: https://lkml.org/lkml/2019/8/22/1350 - -Reported-by: Barry Song -Reported-by: Stephan Gerhold -Reviewed-by: Daniel Thompson -Reviewed-by: Mark Brown -Tested-by: Stephan Gerhold -Signed-off-by: Lee Jones -Signed-off-by: Sasha Levin ---- - drivers/mfd/mfd-core.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c -index 182973df1aed..99a9c5c56ea9 100644 ---- a/drivers/mfd/mfd-core.c -+++ b/drivers/mfd/mfd-core.c -@@ -178,6 +178,11 @@ static int mfd_add_device(struct device *parent, int id, - if (parent->of_node && cell->of_compatible) { - for_each_child_of_node(parent->of_node, np) { - if (of_device_is_compatible(np, cell->of_compatible)) { -+ if (!of_device_is_available(np)) { -+ /* Ignore disabled devices error free */ -+ ret = 0; -+ goto fail_alias; -+ } - pdev->dev.of_node = np; - pdev->dev.fwnode = &np->fwnode; - break; --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 5f5021aecc7..01a81f70180 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -29,7 +29,6 @@ clk-qcom-allow-constant-ratio-freq-tables-for-rcg.patch clk-clk-gpio-propagate-rate-change-to-parent.patch irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch -mfd-mfd-core-honour-device-tree-s-request-to-disable.patch fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch scsi-lpfc-fix-coverity-lpfc_cmpl_els_rsp-null-pointe.patch pci-rpaphp-fix-up-pointer-to-first-drc-info-entry.patch diff --git a/queue-4.4/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch b/queue-4.4/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch deleted file mode 100644 index c514800d543..00000000000 --- a/queue-4.4/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6ebc41f96e8756fa51c46ebe291c092b99253905 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2019 11:19:50 +0000 -Subject: mfd: mfd-core: Honour Device Tree's request to disable a child-device - -From: Lee Jones - -[ Upstream commit 6b5c350648b857047b47acf74a57087ad27d6183 ] - -Until now, MFD has assumed all child devices passed to it (via -mfd_cells) are to be registered. It does not take into account -requests from Device Tree and the like to disable child devices -on a per-platform basis. - -Well now it does. - -Link: https://www.spinics.net/lists/arm-kernel/msg366309.html -Link: https://lkml.org/lkml/2019/8/22/1350 - -Reported-by: Barry Song -Reported-by: Stephan Gerhold -Reviewed-by: Daniel Thompson -Reviewed-by: Mark Brown -Tested-by: Stephan Gerhold -Signed-off-by: Lee Jones -Signed-off-by: Sasha Levin ---- - drivers/mfd/mfd-core.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c -index 215bb5eeb5ac..85f4e5582371 100644 ---- a/drivers/mfd/mfd-core.c -+++ b/drivers/mfd/mfd-core.c -@@ -177,6 +177,11 @@ static int mfd_add_device(struct device *parent, int id, - if (parent->of_node && cell->of_compatible) { - for_each_child_of_node(parent->of_node, np) { - if (of_device_is_compatible(np, cell->of_compatible)) { -+ if (!of_device_is_available(np)) { -+ /* Ignore disabled devices error free */ -+ ret = 0; -+ goto fail_alias; -+ } - pdev->dev.of_node = np; - pdev->dev.fwnode = &np->fwnode; - break; --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index ce4a82cbeb0..107979e9dda 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -104,7 +104,6 @@ scsi-lpfc-fix-duplicate-unreg_rpi-error-in-port-offl.patch clk-qcom-allow-constant-ratio-freq-tables-for-rcg.patch irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch -mfd-mfd-core-honour-device-tree-s-request-to-disable.patch fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch scsi-lpfc-fix-coverity-lpfc_cmpl_els_rsp-null-pointe.patch scsi-ufs-fix-potential-bug-which-ends-in-system-hang.patch diff --git a/queue-4.9/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch b/queue-4.9/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch deleted file mode 100644 index edaec4c293d..00000000000 --- a/queue-4.9/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch +++ /dev/null @@ -1,49 +0,0 @@ -From cc8054e433e464f82954cc3ec7d145fe235e81d1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2019 11:19:50 +0000 -Subject: mfd: mfd-core: Honour Device Tree's request to disable a child-device - -From: Lee Jones - -[ Upstream commit 6b5c350648b857047b47acf74a57087ad27d6183 ] - -Until now, MFD has assumed all child devices passed to it (via -mfd_cells) are to be registered. It does not take into account -requests from Device Tree and the like to disable child devices -on a per-platform basis. - -Well now it does. - -Link: https://www.spinics.net/lists/arm-kernel/msg366309.html -Link: https://lkml.org/lkml/2019/8/22/1350 - -Reported-by: Barry Song -Reported-by: Stephan Gerhold -Reviewed-by: Daniel Thompson -Reviewed-by: Mark Brown -Tested-by: Stephan Gerhold -Signed-off-by: Lee Jones -Signed-off-by: Sasha Levin ---- - drivers/mfd/mfd-core.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c -index 5c8ed2150c8b..fae7bfe7a21a 100644 ---- a/drivers/mfd/mfd-core.c -+++ b/drivers/mfd/mfd-core.c -@@ -178,6 +178,11 @@ static int mfd_add_device(struct device *parent, int id, - if (parent->of_node && cell->of_compatible) { - for_each_child_of_node(parent->of_node, np) { - if (of_device_is_compatible(np, cell->of_compatible)) { -+ if (!of_device_is_available(np)) { -+ /* Ignore disabled devices error free */ -+ ret = 0; -+ goto fail_alias; -+ } - pdev->dev.of_node = np; - pdev->dev.fwnode = &np->fwnode; - break; --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index b0a8b560274..3ea9a14eb7e 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -127,7 +127,6 @@ scsi-lpfc-fix-duplicate-unreg_rpi-error-in-port-offl.patch clk-qcom-allow-constant-ratio-freq-tables-for-rcg.patch irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch -mfd-mfd-core-honour-device-tree-s-request-to-disable.patch fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch scsi-lpfc-fix-coverity-lpfc_cmpl_els_rsp-null-pointe.patch scsi-ufs-fix-potential-bug-which-ends-in-system-hang.patch diff --git a/queue-5.4/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch b/queue-5.4/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch deleted file mode 100644 index 33f5cca0832..00000000000 --- a/queue-5.4/mfd-mfd-core-honour-device-tree-s-request-to-disable.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6c7fff1ca4605404f5edfd8860b6891885883931 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Nov 2019 11:19:50 +0000 -Subject: mfd: mfd-core: Honour Device Tree's request to disable a child-device - -From: Lee Jones - -[ Upstream commit 6b5c350648b857047b47acf74a57087ad27d6183 ] - -Until now, MFD has assumed all child devices passed to it (via -mfd_cells) are to be registered. It does not take into account -requests from Device Tree and the like to disable child devices -on a per-platform basis. - -Well now it does. - -Link: https://www.spinics.net/lists/arm-kernel/msg366309.html -Link: https://lkml.org/lkml/2019/8/22/1350 - -Reported-by: Barry Song -Reported-by: Stephan Gerhold -Reviewed-by: Daniel Thompson -Reviewed-by: Mark Brown -Tested-by: Stephan Gerhold -Signed-off-by: Lee Jones -Signed-off-by: Sasha Levin ---- - drivers/mfd/mfd-core.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c -index 23276a80e3b4..b0afefdc9eac 100644 ---- a/drivers/mfd/mfd-core.c -+++ b/drivers/mfd/mfd-core.c -@@ -174,6 +174,11 @@ static int mfd_add_device(struct device *parent, int id, - if (parent->of_node && cell->of_compatible) { - for_each_child_of_node(parent->of_node, np) { - if (of_device_is_compatible(np, cell->of_compatible)) { -+ if (!of_device_is_available(np)) { -+ /* Ignore disabled devices error free */ -+ ret = 0; -+ goto fail_alias; -+ } - pdev->dev.of_node = np; - pdev->dev.fwnode = &np->fwnode; - break; --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index d05420aba09..ff76583476c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -52,7 +52,6 @@ clk-clk-gpio-propagate-rate-change-to-parent.patch irqchip-irq-bcm7038-l1-enable-parent-irq-if-necessar.patch irqchip-ingenic-error-out-if-irq-domain-creation-fai.patch dma-direct-check-for-overflows-on-32-bit-dma-address.patch -mfd-mfd-core-honour-device-tree-s-request-to-disable.patch fs-quota-handle-overflows-of-sysctl-fs.quota.-and-re.patch iommu-arm-smmu-v3-don-t-display-an-error-when-irq-li.patch i2c-stm32f7-fix-reorder-remove-probe-error-handling.patch