Patchwork [U-Boot] net: phy: supplement support for Micrel's KSZ9031

login
register
mail settings
Submitter SARTRE Leo
Date April 30, 2013, 2:57 p.m.
Message ID <3465D313FDFB824F9A9C8CD24FA4F6BC0108CCEC@frontmail.adetel.com>
Download mbox | patch
Permalink /patch/240647/
State Accepted
Delegated to: Joe Hershberger
Headers show

Comments

SARTRE Leo - April 30, 2013, 2:57 p.m.
Add function ksz9031_phy_extended_write and ksz9031_phy_extended_read

Signed-off-by: Leo Sartre <lsartre@adeneo-embedded.com>
---
 drivers/net/phy/micrel.c |   35 ++++++++++++++++++++++++++++++++++-
 include/micrel.h         |    9 +++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

1.7.10.4
Joe Hershberger - July 8, 2013, 4:16 p.m.
On Tue, Apr 30, 2013 at 9:57 AM, SARTRE Leo <lsartre@adeneo-embedded.com> wrote:
>     Add function ksz9031_phy_extended_write and ksz9031_phy_extended_read
>
> Signed-off-by: Leo Sartre <lsartre@adeneo-embedded.com>

Applied, Thanks.
-Joe

Patch

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index a35e915..d3b573d 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -63,6 +63,7 @@  static struct phy_driver KS8721_driver = {
 #define MIIM_KSZ90xx_PHYCTL_10		      (1 << 4)
 #define MIIM_KSZ90xx_PHYCTL_DUPLEX	      (1 << 3)
 
+
 static int ksz90xx_startup(struct phy_device *phydev)
 {
 	unsigned phy_ctl;
@@ -143,9 +144,43 @@  static struct phy_driver ksz9021_driver = {
 };
 #endif
 
-/*
+/**
  * KSZ9031
  */
+/* PHY Registers */
+#define MII_KSZ9031_MMD_ACCES_CTRL	0x0d
+#define MII_KSZ9031_MMD_REG_DATA	0x0e
+
+/* Accessors to extended registers*/
+int ksz9031_phy_extended_write(struct phy_device *phydev,
+			       int devaddr, int regnum, u16 mode, u16 val)
+{
+	/*select register addr for mmd*/
+	phy_write(phydev, MDIO_DEVAD_NONE,
+		  MII_KSZ9031_MMD_ACCES_CTRL, devaddr);
+	/*select register for mmd*/
+	phy_write(phydev, MDIO_DEVAD_NONE,
+		  MII_KSZ9031_MMD_REG_DATA, regnum);
+	/*setup mode*/
+	phy_write(phydev, MDIO_DEVAD_NONE,
+		  MII_KSZ9031_MMD_ACCES_CTRL, (mode | devaddr));
+	/*write the value*/
+	return	phy_write(phydev, MDIO_DEVAD_NONE,
+		MII_KSZ9031_MMD_REG_DATA, val);
+}
+
+int ksz9031_phy_extended_read(struct phy_device *phydev, int devaddr,
+			      int regnum, u16 mode)
+{
+	phy_write(phydev, MDIO_DEVAD_NONE,
+		  MII_KSZ9031_MMD_ACCES_CTRL, devaddr);
+	phy_write(phydev, MDIO_DEVAD_NONE,
+		  MII_KSZ9031_MMD_REG_DATA, regnum);
+	phy_write(phydev, MDIO_DEVAD_NONE,
+		  MII_KSZ9031_MMD_ACCES_CTRL, (devaddr | mode));
+	return phy_read(phydev, MDIO_DEVAD_NONE, MII_KSZ9031_MMD_REG_DATA);
+}
+
 static struct phy_driver ksz9031_driver = {
 	.name = "Micrel ksz9031",
 	.uid  = 0x221620,
diff --git a/include/micrel.h b/include/micrel.h
index 25e8a46..aa54f87 100644
--- a/include/micrel.h
+++ b/include/micrel.h
@@ -8,10 +8,21 @@ 
 #define MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW	0x105
 #define MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW	0x106
 #define MII_KSZ9021_EXT_ANALOG_TEST		0x107
+/* Register operations */
+#define MII_KSZ9031_MOD_REG                     0x0000
+/* Data operations */
+#define MII_KSZ9031_MOD_DATA_NO_POST_INC        0x4000
+#define MII_KSZ9031_MOD_DATA_POST_INC_RW        0x8000
+#define MII_KSZ9031_MOD_DATA_POST_INC_W         0xC000
 
 struct phy_device;
 int ksz9021_phy_extended_write(struct phy_device *phydev, int regnum, u16 val);
 int ksz9021_phy_extended_read(struct phy_device *phydev, int regnum);
 
+int ksz9031_phy_extended_write(struct phy_device *phydev,
+				       int devaddr, int regnum, u16 mode,
+				       u16 val);
+int ksz9031_phy_extended_read(struct phy_device *phydev, int devaddr,
+				      int regnum, u16 mode);
+
 #endif
--