]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Oct 2018 09:17:25 +0000 (02:17 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Oct 2018 09:17:25 +0000 (02:17 -0700)
queue-3.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch [deleted file]
queue-3.18/series
queue-4.14/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch [deleted file]
queue-4.14/series
queue-4.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch [deleted file]
queue-4.18/series
queue-4.4/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch [deleted file]
queue-4.4/series
queue-4.9/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch [deleted file]
queue-4.9/series

diff --git a/queue-3.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch b/queue-3.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
deleted file mode 100644 (file)
index 383e234..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From foo@baz Thu Oct  4 12:43:46 PDT 2018
-From: Tony Lindgren <tony@atomide.com>
-Date: Wed, 29 Aug 2018 08:00:24 -0700
-Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel
-
-From: Tony Lindgren <tony@atomide.com>
-
-[ Upstream commit 18eb8aea7fb2fb4490e578b1b8a1096c34b2fc48 ]
-
-The cpsw-phy-sel device is not a child of the cpsw interconnect target
-module. It lives in the system control module.
-
-Let's fix this issue by trying to use cpsw-phy-sel phandle first if it
-exists and if not fall back to current usage of trying to find the
-cpsw-phy-sel child. That way the phy sel driver can be a child of the
-system control module where it belongs in the device tree.
-
-Without this fix, we cannot have a proper interconnect target module
-hierarchy in device tree for things like genpd.
-
-Note that deferred probe is mostly not supported by cpsw and this patch
-does not attempt to fix that. In case deferred probe support is needed,
-this could be added to cpsw_slave_open() and phy_connect() so they start
-handling and returning errors.
-
-For documenting it, looks like the cpsw-phy-sel is used for all cpsw device
-tree nodes. It's missing the related binding documentation, so let's also
-update the binding documentation accordingly.
-
-Cc: devicetree@vger.kernel.org
-Cc: Andrew Lunn <andrew@lunn.ch>
-Cc: Grygorii Strashko <grygorii.strashko@ti.com>
-Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Murali Karicheri <m-karicheri2@ti.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/ti/cpsw-phy-sel.c |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
-+++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
-@@ -145,10 +145,13 @@ void cpsw_phy_sel(struct device *dev, ph
-       struct device_node *node;
-       struct cpsw_phy_sel_priv *priv;
--      node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+      node = of_parse_phandle(dev->of_node, "cpsw-phy-sel", 0);
-       if (!node) {
--              dev_err(dev, "Phy mode driver DT not found\n");
--              return;
-+              node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+              if (!node) {
-+                      dev_err(dev, "Phy mode driver DT not found\n");
-+                      return;
-+              }
-       }
-       dev = bus_find_device(&platform_bus_type, NULL, node, match);
index 9b8fe5962e51c140ea72c178eecfa8cf33df945d..dbd2889e6da61ffe9afa3b1ce2bc9c4288623a01 100644 (file)
@@ -73,7 +73,6 @@ mac80211-correct-use-of-ieee80211_vht_cap_rxstbc_x.patch
 gpio-adp5588-fix-sleep-in-atomic-context-bug.patch
 cfg80211-nl80211_update_ft_ies-to-validate-nl80211_attr_ie.patch
 raid10-bug_on-in-raise_barrier-when-force-is-true-and-conf-barrier-is-0.patch
-net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
 net-cadence-fix-a-sleep-in-atomic-context-bug-in-macb_halt_tx.patch
 fs-cifs-don-t-translate-sfm_slash-u-f026-to-backslash.patch
 mac80211-fix-a-race-between-restart-and-csa-flows.patch
diff --git a/queue-4.14/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch b/queue-4.14/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
deleted file mode 100644 (file)
index 0391dfc..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From foo@baz Thu Oct  4 12:33:16 PDT 2018
-From: Tony Lindgren <tony@atomide.com>
-Date: Wed, 29 Aug 2018 08:00:24 -0700
-Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel
-
-From: Tony Lindgren <tony@atomide.com>
-
-[ Upstream commit 18eb8aea7fb2fb4490e578b1b8a1096c34b2fc48 ]
-
-The cpsw-phy-sel device is not a child of the cpsw interconnect target
-module. It lives in the system control module.
-
-Let's fix this issue by trying to use cpsw-phy-sel phandle first if it
-exists and if not fall back to current usage of trying to find the
-cpsw-phy-sel child. That way the phy sel driver can be a child of the
-system control module where it belongs in the device tree.
-
-Without this fix, we cannot have a proper interconnect target module
-hierarchy in device tree for things like genpd.
-
-Note that deferred probe is mostly not supported by cpsw and this patch
-does not attempt to fix that. In case deferred probe support is needed,
-this could be added to cpsw_slave_open() and phy_connect() so they start
-handling and returning errors.
-
-For documenting it, looks like the cpsw-phy-sel is used for all cpsw device
-tree nodes. It's missing the related binding documentation, so let's also
-update the binding documentation accordingly.
-
-Cc: devicetree@vger.kernel.org
-Cc: Andrew Lunn <andrew@lunn.ch>
-Cc: Grygorii Strashko <grygorii.strashko@ti.com>
-Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Murali Karicheri <m-karicheri2@ti.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/ti/cpsw-phy-sel.c |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
-+++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
-@@ -170,10 +170,13 @@ void cpsw_phy_sel(struct device *dev, ph
-       struct device_node *node;
-       struct cpsw_phy_sel_priv *priv;
--      node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+      node = of_parse_phandle(dev->of_node, "cpsw-phy-sel", 0);
-       if (!node) {
--              dev_err(dev, "Phy mode driver DT not found\n");
--              return;
-+              node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+              if (!node) {
-+                      dev_err(dev, "Phy mode driver DT not found\n");
-+                      return;
-+              }
-       }
-       dev = bus_find_device(&platform_bus_type, NULL, node, match);
index 6efac2d89b3677ae98335456bbe326538d21a5f9..717fb91c6416abe41c1d54ecd4b7f781aedfdf59 100644 (file)
@@ -25,7 +25,6 @@ gpio-fix-crash-due-to-registration-race.patch
 arc-atomics-unbork-atomic_fetch_-op.patch
 md-raid5-cache-disable-reshape-completely.patch
 raid10-bug_on-in-raise_barrier-when-force-is-true-and-conf-barrier-is-0.patch
-net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
 i2c-uniphier-issue-stop-only-for-last-message-or-i2c_m_stop.patch
 i2c-uniphier-f-issue-stop-only-for-last-message-or-i2c_m_stop.patch
 net-cadence-fix-a-sleep-in-atomic-context-bug-in-macb_halt_tx.patch
diff --git a/queue-4.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch b/queue-4.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
deleted file mode 100644 (file)
index 66cc174..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From foo@baz Thu Oct  4 12:32:08 PDT 2018
-From: Tony Lindgren <tony@atomide.com>
-Date: Wed, 29 Aug 2018 08:00:24 -0700
-Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel
-
-From: Tony Lindgren <tony@atomide.com>
-
-[ Upstream commit 18eb8aea7fb2fb4490e578b1b8a1096c34b2fc48 ]
-
-The cpsw-phy-sel device is not a child of the cpsw interconnect target
-module. It lives in the system control module.
-
-Let's fix this issue by trying to use cpsw-phy-sel phandle first if it
-exists and if not fall back to current usage of trying to find the
-cpsw-phy-sel child. That way the phy sel driver can be a child of the
-system control module where it belongs in the device tree.
-
-Without this fix, we cannot have a proper interconnect target module
-hierarchy in device tree for things like genpd.
-
-Note that deferred probe is mostly not supported by cpsw and this patch
-does not attempt to fix that. In case deferred probe support is needed,
-this could be added to cpsw_slave_open() and phy_connect() so they start
-handling and returning errors.
-
-For documenting it, looks like the cpsw-phy-sel is used for all cpsw device
-tree nodes. It's missing the related binding documentation, so let's also
-update the binding documentation accordingly.
-
-Cc: devicetree@vger.kernel.org
-Cc: Andrew Lunn <andrew@lunn.ch>
-Cc: Grygorii Strashko <grygorii.strashko@ti.com>
-Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Murali Karicheri <m-karicheri2@ti.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/ti/cpsw-phy-sel.c |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
-+++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
-@@ -170,10 +170,13 @@ void cpsw_phy_sel(struct device *dev, ph
-       struct device_node *node;
-       struct cpsw_phy_sel_priv *priv;
--      node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+      node = of_parse_phandle(dev->of_node, "cpsw-phy-sel", 0);
-       if (!node) {
--              dev_err(dev, "Phy mode driver DT not found\n");
--              return;
-+              node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+              if (!node) {
-+                      dev_err(dev, "Phy mode driver DT not found\n");
-+                      return;
-+              }
-       }
-       dev = bus_find_device(&platform_bus_type, NULL, node, match);
index af4578d41e5c43b05b2abba3add39a2c1b3ff5b0..80df689a201ddffdbeb103641b130a337524f15e 100644 (file)
@@ -50,7 +50,6 @@ selftests-pmtu-detect-correct-binary-to-ping-ipv6-addresses.patch
 ibmvnic-include-missing-return-code-checks-in-reset-function.patch
 bpf-fix-bpf_msg_pull_data.patch
 bpf-avoid-misuse-of-psock-when-tcp_ulp_bpf-collides-with-another-ulp.patch
-net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
 i2c-uniphier-issue-stop-only-for-last-message-or-i2c_m_stop.patch
 i2c-uniphier-f-issue-stop-only-for-last-message-or-i2c_m_stop.patch
 net-cadence-fix-a-sleep-in-atomic-context-bug-in-macb_halt_tx.patch
diff --git a/queue-4.4/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch b/queue-4.4/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
deleted file mode 100644 (file)
index 80934f4..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From foo@baz Thu Oct  4 12:39:38 PDT 2018
-From: Tony Lindgren <tony@atomide.com>
-Date: Wed, 29 Aug 2018 08:00:24 -0700
-Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel
-
-From: Tony Lindgren <tony@atomide.com>
-
-[ Upstream commit 18eb8aea7fb2fb4490e578b1b8a1096c34b2fc48 ]
-
-The cpsw-phy-sel device is not a child of the cpsw interconnect target
-module. It lives in the system control module.
-
-Let's fix this issue by trying to use cpsw-phy-sel phandle first if it
-exists and if not fall back to current usage of trying to find the
-cpsw-phy-sel child. That way the phy sel driver can be a child of the
-system control module where it belongs in the device tree.
-
-Without this fix, we cannot have a proper interconnect target module
-hierarchy in device tree for things like genpd.
-
-Note that deferred probe is mostly not supported by cpsw and this patch
-does not attempt to fix that. In case deferred probe support is needed,
-this could be added to cpsw_slave_open() and phy_connect() so they start
-handling and returning errors.
-
-For documenting it, looks like the cpsw-phy-sel is used for all cpsw device
-tree nodes. It's missing the related binding documentation, so let's also
-update the binding documentation accordingly.
-
-Cc: devicetree@vger.kernel.org
-Cc: Andrew Lunn <andrew@lunn.ch>
-Cc: Grygorii Strashko <grygorii.strashko@ti.com>
-Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Murali Karicheri <m-karicheri2@ti.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/ti/cpsw-phy-sel.c |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
-+++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
-@@ -147,10 +147,13 @@ void cpsw_phy_sel(struct device *dev, ph
-       struct device_node *node;
-       struct cpsw_phy_sel_priv *priv;
--      node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+      node = of_parse_phandle(dev->of_node, "cpsw-phy-sel", 0);
-       if (!node) {
--              dev_err(dev, "Phy mode driver DT not found\n");
--              return;
-+              node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+              if (!node) {
-+                      dev_err(dev, "Phy mode driver DT not found\n");
-+                      return;
-+              }
-       }
-       dev = bus_find_device(&platform_bus_type, NULL, node, match);
index 0eab583a1f7f088e07ec97a6d524a4bd93385d57..c021356bfc058707481deb6710fd4af610f669d2 100644 (file)
@@ -78,7 +78,6 @@ gpio-adp5588-fix-sleep-in-atomic-context-bug.patch
 mac80211-mesh-fix-hwmp-sequence-numbering-to-follow-standard.patch
 cfg80211-nl80211_update_ft_ies-to-validate-nl80211_attr_ie.patch
 raid10-bug_on-in-raise_barrier-when-force-is-true-and-conf-barrier-is-0.patch
-net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
 i2c-uniphier-issue-stop-only-for-last-message-or-i2c_m_stop.patch
 i2c-uniphier-f-issue-stop-only-for-last-message-or-i2c_m_stop.patch
 net-cadence-fix-a-sleep-in-atomic-context-bug-in-macb_halt_tx.patch
diff --git a/queue-4.9/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch b/queue-4.9/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
deleted file mode 100644 (file)
index c9f4a8d..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From foo@baz Thu Oct  4 12:38:43 PDT 2018
-From: Tony Lindgren <tony@atomide.com>
-Date: Wed, 29 Aug 2018 08:00:24 -0700
-Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel
-
-From: Tony Lindgren <tony@atomide.com>
-
-[ Upstream commit 18eb8aea7fb2fb4490e578b1b8a1096c34b2fc48 ]
-
-The cpsw-phy-sel device is not a child of the cpsw interconnect target
-module. It lives in the system control module.
-
-Let's fix this issue by trying to use cpsw-phy-sel phandle first if it
-exists and if not fall back to current usage of trying to find the
-cpsw-phy-sel child. That way the phy sel driver can be a child of the
-system control module where it belongs in the device tree.
-
-Without this fix, we cannot have a proper interconnect target module
-hierarchy in device tree for things like genpd.
-
-Note that deferred probe is mostly not supported by cpsw and this patch
-does not attempt to fix that. In case deferred probe support is needed,
-this could be added to cpsw_slave_open() and phy_connect() so they start
-handling and returning errors.
-
-For documenting it, looks like the cpsw-phy-sel is used for all cpsw device
-tree nodes. It's missing the related binding documentation, so let's also
-update the binding documentation accordingly.
-
-Cc: devicetree@vger.kernel.org
-Cc: Andrew Lunn <andrew@lunn.ch>
-Cc: Grygorii Strashko <grygorii.strashko@ti.com>
-Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Murali Karicheri <m-karicheri2@ti.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/ti/cpsw-phy-sel.c |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/ti/cpsw-phy-sel.c
-+++ b/drivers/net/ethernet/ti/cpsw-phy-sel.c
-@@ -170,10 +170,13 @@ void cpsw_phy_sel(struct device *dev, ph
-       struct device_node *node;
-       struct cpsw_phy_sel_priv *priv;
--      node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+      node = of_parse_phandle(dev->of_node, "cpsw-phy-sel", 0);
-       if (!node) {
--              dev_err(dev, "Phy mode driver DT not found\n");
--              return;
-+              node = of_get_child_by_name(dev->of_node, "cpsw-phy-sel");
-+              if (!node) {
-+                      dev_err(dev, "Phy mode driver DT not found\n");
-+                      return;
-+              }
-       }
-       dev = bus_find_device(&platform_bus_type, NULL, node, match);
index e78b7b1a95fd8b9db4be959e77329b14a7c18321..7a6756f7a6924d3e9aae9f0534df8a01d35d214c 100644 (file)
@@ -11,7 +11,6 @@ cfg80211-nl80211_update_ft_ies-to-validate-nl80211_attr_ie.patch
 gpio-fix-crash-due-to-registration-race.patch
 arc-atomics-unbork-atomic_fetch_-op.patch
 raid10-bug_on-in-raise_barrier-when-force-is-true-and-conf-barrier-is-0.patch
-net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch
 i2c-uniphier-issue-stop-only-for-last-message-or-i2c_m_stop.patch
 i2c-uniphier-f-issue-stop-only-for-last-message-or-i2c_m_stop.patch
 net-cadence-fix-a-sleep-in-atomic-context-bug-in-macb_halt_tx.patch