aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-11-22 19:06:51 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-11-22 19:06:51 +0000
commit3789b1f5a0760bce2f56993685a3f7e7202d41d0 (patch)
tree5fa9d37601b64b81ca4fce683b6cd8bc58b44843 /target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch
parentb1a91ca57fc9bbdb648e77790a0812fd9bd96373 (diff)
downloadupstream-3789b1f5a0760bce2f56993685a3f7e7202d41d0.tar.gz
upstream-3789b1f5a0760bce2f56993685a3f7e7202d41d0.tar.bz2
upstream-3789b1f5a0760bce2f56993685a3f7e7202d41d0.zip
ipq806x: update stmmac to the version from linux 4.3
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 47593
Diffstat (limited to 'target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch')
-rw-r--r--target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch64
1 files changed, 0 insertions, 64 deletions
diff --git a/target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch b/target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch
deleted file mode 100644
index f2305ac5aa..0000000000
--- a/target/linux/ipq806x/patches-4.1/703-stmmac-add-fixed-link-device-tree-support.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3a95f75867be562cb919ff23a738f70357188fbd Mon Sep 17 00:00:00 2001
-From: Mathieu Olivari <mathieu@codeaurora.org>
-Date: Fri, 8 May 2015 16:02:03 -0700
-Subject: [PATCH 3/8] stmmac: add fixed-link device-tree support
-
-In case DT is used, this change adds the ability to the stmmac driver to
-detect a fixed-link PHY, instanciate it, and use it during
-phy_connect().
-
-Fixed link PHYs DT usage is described in:
-Documentation/devicetree/bindings/net/fixed-link.txt
-
-Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
----
- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 12 +++++++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -859,7 +859,7 @@ static int stmmac_init_phy(struct net_de
- * device as well.
- * Note: phydev->phy_id is the result of reading the UID PHY registers.
- */
-- if (phydev->phy_id == 0) {
-+ if (!priv->plat->phy_node && phydev->phy_id == 0) {
- phy_disconnect(phydev);
- return -ENODEV;
- }
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-@@ -177,6 +177,14 @@ static int stmmac_probe_config_dt(struct
- /* If we find a phy-handle property, use it as the PHY */
- plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
-
-+ /* If phy-handle is not specified, check if we have a fixed-phy */
-+ if (!plat->phy_node && of_phy_is_fixed_link(np)) {
-+ if ((of_phy_register_fixed_link(np) < 0))
-+ return -ENODEV;
-+
-+ plat->phy_node = of_node_get(np);
-+ }
-+
- /* "snps,phy-addr" is not a standard property. Mark it as deprecated
- * and warn of its use. Remove this when phy node support is added.
- */
-@@ -243,7 +251,7 @@ static int stmmac_probe_config_dt(struct
- GFP_KERNEL);
- if (!dma_cfg) {
- ret = -ENOMEM;
-- goto err;
-+ goto err2;
- }
- plat->dma_cfg = dma_cfg;
- of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
-@@ -263,6 +271,8 @@ static int stmmac_probe_config_dt(struct
-
- return 0;
-
-+err2:
-+ of_node_put(np);
- err:
- return ret;
- }