From a8236bd3fcffba0d059a90203c97d2132acdd810 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 6 Oct 2018 02:17:25 -0700 Subject: [PATCH] drop net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch --- ...w-phy-sel-prefer-phandle-for-phy-sel.patch | 63 ------------------- queue-3.18/series | 1 - ...w-phy-sel-prefer-phandle-for-phy-sel.patch | 63 ------------------- queue-4.14/series | 1 - ...w-phy-sel-prefer-phandle-for-phy-sel.patch | 63 ------------------- queue-4.18/series | 1 - ...w-phy-sel-prefer-phandle-for-phy-sel.patch | 63 ------------------- queue-4.4/series | 1 - ...w-phy-sel-prefer-phandle-for-phy-sel.patch | 63 ------------------- queue-4.9/series | 1 - 10 files changed, 320 deletions(-) delete mode 100644 queue-3.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch delete mode 100644 queue-4.14/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch delete mode 100644 queue-4.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch delete mode 100644 queue-4.4/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch delete mode 100644 queue-4.9/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch 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 index 383e234c4c0..00000000000 --- a/queue-3.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch +++ /dev/null @@ -1,63 +0,0 @@ -From foo@baz Thu Oct 4 12:43:46 PDT 2018 -From: Tony Lindgren -Date: Wed, 29 Aug 2018 08:00:24 -0700 -Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel - -From: Tony Lindgren - -[ 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 -Cc: Grygorii Strashko -Cc: Ivan Khoronzhuk -Cc: Mark Rutland -Cc: Murali Karicheri -Cc: Rob Herring -Signed-off-by: Tony Lindgren -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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); diff --git a/queue-3.18/series b/queue-3.18/series index 9b8fe5962e5..dbd2889e6da 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -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 index 0391dfc3f74..00000000000 --- a/queue-4.14/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch +++ /dev/null @@ -1,63 +0,0 @@ -From foo@baz Thu Oct 4 12:33:16 PDT 2018 -From: Tony Lindgren -Date: Wed, 29 Aug 2018 08:00:24 -0700 -Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel - -From: Tony Lindgren - -[ 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 -Cc: Grygorii Strashko -Cc: Ivan Khoronzhuk -Cc: Mark Rutland -Cc: Murali Karicheri -Cc: Rob Herring -Signed-off-by: Tony Lindgren -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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); diff --git a/queue-4.14/series b/queue-4.14/series index 6efac2d89b3..717fb91c641 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -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 index 66cc1745d3f..00000000000 --- a/queue-4.18/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch +++ /dev/null @@ -1,63 +0,0 @@ -From foo@baz Thu Oct 4 12:32:08 PDT 2018 -From: Tony Lindgren -Date: Wed, 29 Aug 2018 08:00:24 -0700 -Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel - -From: Tony Lindgren - -[ 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 -Cc: Grygorii Strashko -Cc: Ivan Khoronzhuk -Cc: Mark Rutland -Cc: Murali Karicheri -Cc: Rob Herring -Signed-off-by: Tony Lindgren -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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); diff --git a/queue-4.18/series b/queue-4.18/series index af4578d41e5..80df689a201 100644 --- a/queue-4.18/series +++ b/queue-4.18/series @@ -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 index 80934f48854..00000000000 --- a/queue-4.4/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch +++ /dev/null @@ -1,63 +0,0 @@ -From foo@baz Thu Oct 4 12:39:38 PDT 2018 -From: Tony Lindgren -Date: Wed, 29 Aug 2018 08:00:24 -0700 -Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel - -From: Tony Lindgren - -[ 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 -Cc: Grygorii Strashko -Cc: Ivan Khoronzhuk -Cc: Mark Rutland -Cc: Murali Karicheri -Cc: Rob Herring -Signed-off-by: Tony Lindgren -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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); diff --git a/queue-4.4/series b/queue-4.4/series index 0eab583a1f7..c021356bfc0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -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 index c9f4a8d4ed0..00000000000 --- a/queue-4.9/net-ethernet-cpsw-phy-sel-prefer-phandle-for-phy-sel.patch +++ /dev/null @@ -1,63 +0,0 @@ -From foo@baz Thu Oct 4 12:38:43 PDT 2018 -From: Tony Lindgren -Date: Wed, 29 Aug 2018 08:00:24 -0700 -Subject: net: ethernet: cpsw-phy-sel: prefer phandle for phy sel - -From: Tony Lindgren - -[ 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 -Cc: Grygorii Strashko -Cc: Ivan Khoronzhuk -Cc: Mark Rutland -Cc: Murali Karicheri -Cc: Rob Herring -Signed-off-by: Tony Lindgren -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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); diff --git a/queue-4.9/series b/queue-4.9/series index e78b7b1a95f..7a6756f7a69 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -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 -- 2.47.2