netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linville@tuxdriver.com,
	Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next v2 04/12] net: dsa: retain a per-port device_node pointer
Date: Tue,  5 Aug 2014 15:31:38 -0700	[thread overview]
Message-ID: <1407277906-19989-5-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1407277906-19989-1-git-send-email-f.fainelli@gmail.com>

We will later use the per-port device_node pointer to fetch a bunch of
port-specific properties.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes in v2:
- assign slave_dev->dev.of_node for various OF routines to work correctly

 include/net/dsa.h | 1 +
 net/dsa/dsa.c     | 2 ++
 net/dsa/slave.c   | 1 +
 3 files changed, 4 insertions(+)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 9a16c5290738..c435eaa772d5 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -41,6 +41,7 @@ struct dsa_chip_data {
 	 * or any other string to indicate this is a physical port.
 	 */
 	char		*port_names[DSA_MAX_PORTS];
+	struct device_node *port_dn[DSA_MAX_PORTS];
 
 	/*
 	 * An array (with nr_chips elements) of which element [a]
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 069586547cf5..788b2b2f39f2 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -432,6 +432,8 @@ static int dsa_of_probe(struct platform_device *pdev)
 			if (!port_name)
 				continue;
 
+			cd->port_dn[port_index] = port;
+
 			cd->port_names[port_index] = kstrdup(port_name,
 					GFP_KERNEL);
 			if (!cd->port_names[port_index]) {
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 45a1e34c89e0..9e4d3816c54e 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -371,6 +371,7 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
 	}
 
 	SET_NETDEV_DEV(slave_dev, parent);
+	slave_dev->dev.of_node = ds->pd->port_dn[port];
 	slave_dev->vlan_features = master->vlan_features;
 
 	p = netdev_priv(slave_dev);
-- 
1.9.1

  parent reply	other threads:[~2014-08-05 22:32 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-05 22:31 [PATCH net-next v2 00/12] dsa: support for Broadcom Starfighter 2 Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 01/12] net: phy: add generic UniMAC MDIO bus driver Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 02/12] net: dsa: add Broadcom tag hook Florian Fainelli
2014-08-06 12:25   ` Sergei Shtylyov
2014-08-06 14:47   ` Alexander Duyck
2014-08-06 18:37     ` Florian Fainelli
2014-08-06 20:16       ` Alexander Duyck
2014-08-05 22:31 ` [PATCH net-next v2 03/12] net: dsa: provide a switch device device tree node pointer Florian Fainelli
2014-08-05 22:31 ` Florian Fainelli [this message]
2014-08-05 22:31 ` [PATCH net-next v2 05/12] net: dsa: allow for more complex PHY setups Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 06/12] net: dsa: allow switches to work without tagging Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 07/12] net: dsa: allow drivers to do link adjustment Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 08/12] net: dsa: allow updating fixed PHY link information Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 09/12] net: dsa: add Broadcom tag RX/TX handler Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 10/12] net: dsa: add Broadcom SF2 switch driver Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 11/12] Documentation: devicetree: update dsa binding with optional properties Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 12/12] Documentation: devicetree: add Broadcom Starfighter 2 binding Florian Fainelli
2014-08-05 22:38 ` [PATCH net-next v2 00/12] dsa: support for Broadcom Starfighter 2 David Miller

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=1407277906-19989-5-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=davem@davemloft.net \
    --cc=linville@tuxdriver.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).