|
|
@@ -1,14 +1,21 @@
|
|
|
-From 5de1da6c862de6a92ac9aed521f21fd5a180f22b Mon Sep 17 00:00:00 2001
|
|
|
-From: Christian Lamparter <chunkeey@gmail.com>
|
|
|
-Date: Sat, 2 Feb 2019 02:48:35 +0100
|
|
|
-Subject: [PATCH] net: mdio: add ipq8064 mdio driver
|
|
|
+From caaa71fac36ec8c19145dbf8262a9b77ab09f1a1 Mon Sep 17 00:00:00 2001
|
|
|
+From: Ansuel Smith <ansuelsmth@gmail.com>
|
|
|
+Date: Wed, 4 Mar 2020 22:38:32 +0100
|
|
|
+Subject: net: mdio: add ipq8064 mdio driver
|
|
|
|
|
|
+Currently ipq806x soc use generic bitbang driver to
|
|
|
+comunicate with the gmac ethernet interface.
|
|
|
+Add a dedicated driver created by chunkeey to fix this.
|
|
|
+
|
|
|
+Co-developed-by: Christian Lamparter <[email protected]>
|
|
|
Signed-off-by: Christian Lamparter <[email protected]>
|
|
|
+Signed-off-by: Ansuel Smith <[email protected]>
|
|
|
+Signed-off-by: David S. Miller <[email protected]>
|
|
|
---
|
|
|
drivers/net/phy/Kconfig | 8 ++
|
|
|
drivers/net/phy/Makefile | 1 +
|
|
|
- drivers/net/phy/mdio-ipq8064.c | 163 +++++++++++++++++++++++++++++++++
|
|
|
- 3 files changed, 172 insertions(+)
|
|
|
+ drivers/net/phy/mdio-ipq8064.c | 166 +++++++++++++++++++++++++++++++++++++++++
|
|
|
+ 3 files changed, 175 insertions(+)
|
|
|
create mode 100644 drivers/net/phy/mdio-ipq8064.c
|
|
|
|
|
|
--- a/drivers/net/phy/Kconfig
|
|
|
@@ -40,12 +47,13 @@ Signed-off-by: Christian Lamparter <[email protected]>
|
|
|
obj-$(CONFIG_MDIO_OCTEON) += mdio-octeon.o
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/net/phy/mdio-ipq8064.c
|
|
|
-@@ -0,0 +1,163 @@
|
|
|
+@@ -0,0 +1,166 @@
|
|
|
+// SPDX-License-Identifier: GPL-2.0
|
|
|
-+//
|
|
|
-+// Qualcomm IPQ8064 MDIO interface driver
|
|
|
-+//
|
|
|
-+// Copyright (C) 2019 Christian Lamparter <[email protected]>
|
|
|
++/* Qualcomm IPQ8064 MDIO interface driver
|
|
|
++ *
|
|
|
++ * Copyright (C) 2019 Christian Lamparter <[email protected]>
|
|
|
++ * Copyright (C) 2020 Ansuel Smith <[email protected]>
|
|
|
++ */
|
|
|
+
|
|
|
+#include <linux/delay.h>
|
|
|
+#include <linux/kernel.h>
|
|
|
@@ -74,8 +82,8 @@ Signed-off-by: Christian Lamparter <[email protected]>
|
|
|
+
|
|
|
+#define MII_DATA_REG_ADDR 0x14
|
|
|
+
|
|
|
-+#define MII_MDIO_DELAY (1000)
|
|
|
-+#define MII_MDIO_RETRY (10)
|
|
|
++#define MII_MDIO_DELAY_USEC (1000)
|
|
|
++#define MII_MDIO_RETRY_MSEC (10)
|
|
|
+
|
|
|
+struct ipq8064_mdio {
|
|
|
+ struct regmap *base; /* NSS_GMAC0_BASE */
|
|
|
@@ -84,34 +92,30 @@ Signed-off-by: Christian Lamparter <[email protected]>
|
|
|
+static int
|
|
|
+ipq8064_mdio_wait_busy(struct ipq8064_mdio *priv)
|
|
|
+{
|
|
|
-+ int i;
|
|
|
-+
|
|
|
-+ for (i = 0; i < MII_MDIO_RETRY; i++) {
|
|
|
-+ unsigned int busy;
|
|
|
-+
|
|
|
-+ regmap_read(priv->base, MII_ADDR_REG_ADDR, &busy);
|
|
|
-+ if (!(busy & MII_BUSY))
|
|
|
-+ return 0;
|
|
|
++ u32 busy;
|
|
|
+
|
|
|
-+ udelay(MII_MDIO_DELAY);
|
|
|
-+ }
|
|
|
-+
|
|
|
-+ return -ETIMEDOUT;
|
|
|
++ return regmap_read_poll_timeout(priv->base, MII_ADDR_REG_ADDR, busy,
|
|
|
++ !(busy & MII_BUSY), MII_MDIO_DELAY_USEC,
|
|
|
++ MII_MDIO_RETRY_MSEC * USEC_PER_MSEC);
|
|
|
+}
|
|
|
+
|
|
|
+static int
|
|
|
+ipq8064_mdio_read(struct mii_bus *bus, int phy_addr, int reg_offset)
|
|
|
+{
|
|
|
-+ struct ipq8064_mdio *priv = bus->priv;
|
|
|
+ u32 miiaddr = MII_BUSY | MII_CLKRANGE_250_300M;
|
|
|
++ struct ipq8064_mdio *priv = bus->priv;
|
|
|
+ u32 ret_val;
|
|
|
+ int err;
|
|
|
+
|
|
|
++ /* Reject clause 45 */
|
|
|
++ if (reg_offset & MII_ADDR_C45)
|
|
|
++ return -EOPNOTSUPP;
|
|
|
++
|
|
|
+ miiaddr |= ((phy_addr << MII_ADDR_SHIFT) & MII_ADDR_MASK) |
|
|
|
+ ((reg_offset << MII_REG_SHIFT) & MII_REG_MASK);
|
|
|
+
|
|
|
+ regmap_write(priv->base, MII_ADDR_REG_ADDR, miiaddr);
|
|
|
-+ udelay(10);
|
|
|
++ usleep_range(8, 10);
|
|
|
+
|
|
|
+ err = ipq8064_mdio_wait_busy(priv);
|
|
|
+ if (err)
|
|
|
@@ -124,8 +128,12 @@ Signed-off-by: Christian Lamparter <[email protected]>
|
|
|
+static int
|
|
|
+ipq8064_mdio_write(struct mii_bus *bus, int phy_addr, int reg_offset, u16 data)
|
|
|
+{
|
|
|
-+ struct ipq8064_mdio *priv = bus->priv;
|
|
|
+ u32 miiaddr = MII_WRITE | MII_BUSY | MII_CLKRANGE_250_300M;
|
|
|
++ struct ipq8064_mdio *priv = bus->priv;
|
|
|
++
|
|
|
++ /* Reject clause 45 */
|
|
|
++ if (reg_offset & MII_ADDR_C45)
|
|
|
++ return -EOPNOTSUPP;
|
|
|
+
|
|
|
+ regmap_write(priv->base, MII_DATA_REG_ADDR, data);
|
|
|
+
|
|
|
@@ -133,7 +141,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
|
|
|
+ ((reg_offset << MII_REG_SHIFT) & MII_REG_MASK);
|
|
|
+
|
|
|
+ regmap_write(priv->base, MII_ADDR_REG_ADDR, miiaddr);
|
|
|
-+ udelay(10);
|
|
|
++ usleep_range(8, 10);
|
|
|
+
|
|
|
+ return ipq8064_mdio_wait_busy(priv);
|
|
|
+}
|
|
|
@@ -157,13 +165,14 @@ Signed-off-by: Christian Lamparter <[email protected]>
|
|
|
+ bus->parent = &pdev->dev;
|
|
|
+
|
|
|
+ priv = bus->priv;
|
|
|
-+ priv->base = syscon_node_to_regmap(np);
|
|
|
-+ if (IS_ERR_OR_NULL(priv->base)) {
|
|
|
-+ priv->base = syscon_regmap_lookup_by_phandle(np, "master");
|
|
|
-+ if (IS_ERR_OR_NULL(priv->base)) {
|
|
|
-+ pr_err("master phandle not found\n");
|
|
|
-+ return -EINVAL;
|
|
|
-+ }
|
|
|
++ priv->base = device_node_to_regmap(np);
|
|
|
++ if (IS_ERR(priv->base)) {
|
|
|
++ if (priv->base == ERR_PTR(-EPROBE_DEFER))
|
|
|
++ return -EPROBE_DEFER;
|
|
|
++
|
|
|
++ dev_err(&pdev->dev, "error getting device regmap, error=%pe\n",
|
|
|
++ priv->base);
|
|
|
++ return PTR_ERR(priv->base);
|
|
|
+ }
|
|
|
+
|
|
|
+ ret = of_mdiobus_register(bus, np);
|
|
|
@@ -203,4 +212,5 @@ Signed-off-by: Christian Lamparter <[email protected]>
|
|
|
+
|
|
|
+MODULE_DESCRIPTION("Qualcomm IPQ8064 MDIO interface driver");
|
|
|
+MODULE_AUTHOR("Christian Lamparter <[email protected]>");
|
|
|
++MODULE_AUTHOR("Ansuel Smith <[email protected]>");
|
|
|
+MODULE_LICENSE("GPL");
|
Ansuel Smith