devicetree.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, cernekee@gmail.com,
	devicetree@vger.kernel.org,
	Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 01/10] net: phy: add "internal" PHY mode
Date: Tue, 11 Feb 2014 20:07:24 -0800	[thread overview]
Message-ID: <1392178053-3143-2-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1392178053-3143-1-git-send-email-f.fainelli@gmail.com>

On some systems, the PHY can be internal, in the same package as the
Ethernet MAC, and still be responding to a specific address on the MDIO
bus, in that case, the Ethernet MAC might need to know about it to
properly configure a port multiplexer to switch to an internal or
external PHY. Add a new PHY interface mode for this and update the
Device Tree of_get_phy_mode() function to look for it.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/of/of_net.c | 1 +
 include/linux/phy.h | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index a208a45..729beba 100644
--- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c
@@ -31,6 +31,7 @@ static const char *phy_modes[] = {
 	[PHY_INTERFACE_MODE_RTBI]	= "rtbi",
 	[PHY_INTERFACE_MODE_SMII]	= "smii",
 	[PHY_INTERFACE_MODE_XGMII]	= "xgmii",
+	[PHY_INTERFACE_MODE_INTERNAL]	= "internal",
 };
 
 /**
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 565188c..463434b 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -74,6 +74,7 @@ typedef enum {
 	PHY_INTERFACE_MODE_RTBI,
 	PHY_INTERFACE_MODE_SMII,
 	PHY_INTERFACE_MODE_XGMII,
+	PHY_INTERFACE_MODE_INTERNAL,
 } phy_interface_t;
 
 
@@ -553,7 +554,8 @@ static inline bool phy_interrupt_is_valid(struct phy_device *phydev)
  */
 static inline bool phy_is_internal(struct phy_device *phydev)
 {
-	return phydev->is_internal;
+	return phydev->is_internal ||
+		phydev->interface == PHY_INTERFACE_MODE_INTERNAL;
 }
 
 /**
-- 
1.8.3.2

  reply	other threads:[~2014-02-12  4:07 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-12  4:07 [PATCH net-next 00/10] Support for Broadcom GENET driver Florian Fainelli
2014-02-12  4:07 ` Florian Fainelli [this message]
2014-02-12 14:35   ` [PATCH net-next 01/10] net: phy: add "internal" PHY mode Sergei Shtylyov
2014-02-12  4:07 ` [PATCH net-next 02/10] net: phy: add MoCA PHY type Florian Fainelli
2014-02-12  4:07 ` [PATCH net-next 03/10] net: phy: update port type for MoCA PHYs Florian Fainelli
2014-02-12  4:07 ` [PATCH net-next 04/10] net: phy: add Broadcom BCM7xxx internal PHY driver Florian Fainelli
2014-02-12  4:07 ` [PATCH net-next 05/10] net: bcmgenet: add driver definitions and private structure Florian Fainelli
2014-02-12  4:07 ` [PATCH net-next 06/10] net: bcmgenet: add main driver file Florian Fainelli
2014-02-12  4:07 ` [PATCH net-next 07/10] net: bcmgenet: add MDIO routines Florian Fainelli
2014-02-12  4:07 ` [PATCH net-next 08/10] net: bcmgenet: hook into the build system Florian Fainelli
2014-02-12  4:07 ` [PATCH net-next 09/10] Documentation: add Device tree bindings for Broadcom GENET Florian Fainelli
2014-02-12  4:07 ` [PATCH net-next 10/10] MAINTAINERS: add entry for the Broadcom GENET driver Florian Fainelli
2014-02-13  0:23 ` [PATCH net-next 00/10] Support for " Florian Fainelli

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=1392178053-3143-2-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=cernekee@gmail.com \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --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).