netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrew Lunn <andrew@lunn.ch>
To: David Miller <davem@davemloft.net>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	netdev <netdev@vger.kernel.org>, Andrew Lunn <andrew@lunn.ch>
Subject: [PATCH net-next 5/9] net: dsa: Allow DSA and CPU ports to have a phy-mode property
Date: Sun, 23 Aug 2015 11:46:56 +0200	[thread overview]
Message-ID: <1440323220-20438-6-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1440323220-20438-1-git-send-email-andrew@lunn.ch>

It can be useful for DSA and CPU ports to have a phy-mode property, in
particular to specify RGMII delays. Parse the property and set it in
the fixed-link phydev.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 net/dsa/dsa.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index afff17341b73..76e3800765f8 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -181,7 +181,7 @@ static int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct net_device *master)
 	struct dsa_chip_data *cd = ds->pd;
 	struct device_node *port_dn;
 	struct phy_device *phydev;
-	int ret, port;
+	int ret, port, mode;
 
 	for (port = 0; port < DSA_MAX_PORTS; port++) {
 		if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))
@@ -196,6 +196,12 @@ static int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct net_device *master)
 				return ret;
 			}
 			phydev = of_phy_find_device(port_dn);
+
+			mode = of_get_phy_mode(port_dn);
+			if (mode < 0)
+				mode = PHY_INTERFACE_MODE_NA;
+			phydev->interface = mode;
+
 			genphy_config_init(phydev);
 			genphy_read_status(phydev);
 			if (ds->drv->adjust_link)
-- 
2.5.0

  parent reply	other threads:[~2015-08-23  9:55 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-23  9:46 [PATCH net-next 0/9] DSA port configuration and status Andrew Lunn
2015-08-23  9:46 ` [PATCH net-next 1/9] net: phy: Allow PHY devices to identify themselves as Ethernet switches, etc Andrew Lunn
2015-08-23  9:46 ` [PATCH net-next 2/9] dsa: mv88e6xxx: Allow speed/duplex of port to be configured Andrew Lunn
2015-08-23 18:52   ` Florian Fainelli
2015-08-23  9:46 ` [PATCH net-next 3/9] phy: fixed_phy: Set supported speed in phydev Andrew Lunn
2015-08-23 18:54   ` Florian Fainelli
2015-08-23  9:46 ` [PATCH net-next 4/9] net: dsa: Allow configuration of CPU & DSA port speeds/duplex Andrew Lunn
2015-08-23 18:38   ` Florian Fainelli
2015-08-23 21:24     ` Andrew Lunn
2015-08-24 17:41       ` Florian Fainelli
2015-08-26  1:45       ` Florian Fainelli
2015-08-23  9:46 ` Andrew Lunn [this message]
2015-08-23 18:44   ` [PATCH net-next 5/9] net: dsa: Allow DSA and CPU ports to have a phy-mode property Florian Fainelli
2015-08-23  9:46 ` [PATCH net-next 6/9] dsa: mv88e6xxx: Set the RGMII delay based on phy interface Andrew Lunn
2015-08-23 18:44   ` Florian Fainelli
2015-08-23 21:10     ` Andrew Lunn
2015-08-24 17:01       ` Florian Fainelli
2015-08-23  9:46 ` [PATCH net-next 7/9] dsa: mv88e6xxx: Don't poll forced interfaces for state changes Andrew Lunn
2015-08-23 18:41   ` Florian Fainelli
2015-08-23  9:46 ` [PATCH net-next 8/9] phy: fixed_phy: Add gpio to determine link up/down Andrew Lunn
2015-08-23 18:50   ` Florian Fainelli
2015-08-23  9:47 ` [PATCH net-next 9/9] phy: fixed_phy: Set phy capabilities even when link is down Andrew Lunn
2015-08-23 18:40   ` Florian Fainelli
2015-08-23 21:02     ` Andrew Lunn
2015-08-24 16:32     ` Andrew Lunn
2015-08-23 18:58 ` [PATCH net-next 0/9] DSA port configuration and status Florian Fainelli
2015-08-25 20:43 ` David Miller
2015-08-26  5:39   ` Andrew Lunn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440323220-20438-6-git-send-email-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).