aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig1
-rw-r--r--drivers/net/fsl_mdio.c140
-rw-r--r--drivers/net/tsec.c32
3 files changed, 162 insertions, 11 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0b08de0ef4..bb23f73fc2 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -162,6 +162,7 @@ config DWC_ETH_QOS
config E1000
bool "Intel PRO/1000 Gigabit Ethernet support"
+ depends on (DM_ETH && DM_PCI) || !DM_ETH
help
This driver supports Intel(R) PRO/1000 gigabit ethernet family of
adapters. For more information on how to identify your adapter, go
diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c
index 894b52ee66..43040d4c3f 100644
--- a/drivers/net/fsl_mdio.c
+++ b/drivers/net/fsl_mdio.c
@@ -12,6 +12,12 @@
#include <asm/io.h>
#include <linux/errno.h>
+#ifdef CONFIG_DM_MDIO
+struct tsec_mdio_priv {
+ struct tsec_mii_mng __iomem *regs;
+};
+#endif
+
void tsec_local_mdio_write(struct tsec_mii_mng __iomem *phyregs, int port_addr,
int dev_addr, int regnum, int value)
{
@@ -56,10 +62,21 @@ int tsec_local_mdio_read(struct tsec_mii_mng __iomem *phyregs, int port_addr,
return value;
}
+#if defined(CONFIG_PHYLIB)
static int fsl_pq_mdio_reset(struct mii_dev *bus)
{
- struct tsec_mii_mng __iomem *regs =
- (struct tsec_mii_mng __iomem *)bus->priv;
+ struct tsec_mii_mng __iomem *regs;
+#ifndef CONFIG_DM_MDIO
+ regs = (struct tsec_mii_mng __iomem *)bus->priv;
+#else
+ struct tsec_mdio_priv *priv;
+
+ if (!bus->priv)
+ return -EINVAL;
+
+ priv = dev_get_priv(bus->priv);
+ regs = priv->regs;
+#endif
/* Reset MII (due to new addresses) */
out_be32(&regs->miimcfg, MIIMCFG_RESET_MGMT);
@@ -71,11 +88,22 @@ static int fsl_pq_mdio_reset(struct mii_dev *bus)
return 0;
}
+#endif
int tsec_phy_read(struct mii_dev *bus, int addr, int dev_addr, int regnum)
{
- struct tsec_mii_mng __iomem *phyregs =
- (struct tsec_mii_mng __iomem *)bus->priv;
+ struct tsec_mii_mng __iomem *phyregs;
+#ifndef CONFIG_DM_MDIO
+ phyregs = (struct tsec_mii_mng __iomem *)bus->priv;
+#else
+ struct tsec_mdio_priv *priv;
+
+ if (!bus->priv)
+ return -EINVAL;
+
+ priv = dev_get_priv(bus->priv);
+ phyregs = priv->regs;
+#endif
return tsec_local_mdio_read(phyregs, addr, dev_addr, regnum);
}
@@ -83,14 +111,25 @@ int tsec_phy_read(struct mii_dev *bus, int addr, int dev_addr, int regnum)
int tsec_phy_write(struct mii_dev *bus, int addr, int dev_addr, int regnum,
u16 value)
{
- struct tsec_mii_mng __iomem *phyregs =
- (struct tsec_mii_mng __iomem *)bus->priv;
+ struct tsec_mii_mng __iomem *phyregs;
+#ifndef CONFIG_DM_MDIO
+ phyregs = (struct tsec_mii_mng __iomem *)bus->priv;
+#else
+ struct tsec_mdio_priv *priv;
+
+ if (!bus->priv)
+ return -EINVAL;
+
+ priv = dev_get_priv(bus->priv);
+ phyregs = priv->regs;
+#endif
tsec_local_mdio_write(phyregs, addr, dev_addr, regnum, value);
return 0;
}
+#ifndef CONFIG_DM_MDIO
int fsl_pq_mdio_init(bd_t *bis, struct fsl_pq_mdio_info *info)
{
struct mii_dev *bus = mdio_alloc();
@@ -109,3 +148,92 @@ int fsl_pq_mdio_init(bd_t *bis, struct fsl_pq_mdio_info *info)
return mdio_register(bus);
}
+#else /* CONFIG_DM_MDIO */
+#if defined(CONFIG_PHYLIB)
+static int tsec_mdio_read(struct udevice *dev, int addr, int devad, int reg)
+{
+ struct mdio_perdev_priv *pdata = (dev) ? dev_get_uclass_priv(dev) :
+ NULL;
+
+ if (pdata && pdata->mii_bus)
+ return tsec_phy_read(pdata->mii_bus, addr, devad, reg);
+
+ return -1;
+}
+
+static int tsec_mdio_write(struct udevice *dev, int addr, int devad, int reg,
+ u16 val)
+{
+ struct mdio_perdev_priv *pdata = (dev) ? dev_get_uclass_priv(dev) :
+ NULL;
+
+ if (pdata && pdata->mii_bus)
+ return tsec_phy_write(pdata->mii_bus, addr, devad, reg, val);
+
+ return -1;
+}
+
+static int tsec_mdio_reset(struct udevice *dev)
+{
+ struct mdio_perdev_priv *pdata = (dev) ? dev_get_uclass_priv(dev) :
+ NULL;
+
+ if (pdata && pdata->mii_bus)
+ return fsl_pq_mdio_reset(pdata->mii_bus);
+
+ return -1;
+}
+
+static const struct mdio_ops tsec_mdio_ops = {
+ .read = tsec_mdio_read,
+ .write = tsec_mdio_write,
+ .reset = tsec_mdio_reset,
+};
+
+static const struct udevice_id tsec_mdio_ids[] = {
+ { .compatible = "fsl,gianfar-tbi" },
+ { .compatible = "fsl,gianfar-mdio" },
+ { .compatible = "fsl,etsec2-tbi" },
+ { .compatible = "fsl,etsec2-mdio" },
+ { .compatible = "fsl,fman-mdio" },
+ {}
+};
+
+static int tsec_mdio_probe(struct udevice *dev)
+{
+ struct tsec_mdio_priv *priv = (dev) ? dev_get_priv(dev) : NULL;
+ struct mdio_perdev_priv *pdata = (dev) ? dev_get_uclass_priv(dev) :
+ NULL;
+
+ if (!dev) {
+ printf("%s dev = NULL\n", __func__);
+ return -1;
+ }
+ if (!priv) {
+ printf("dev_get_priv(dev %p) = NULL\n", dev);
+ return -1;
+ }
+ priv->regs = (void *)(uintptr_t)dev_read_addr(dev);
+ debug("%s priv %p @ regs %p, pdata %p\n", __func__,
+ priv, priv->regs, pdata);
+
+ return 0;
+}
+
+static int tsec_mdio_remove(struct udevice *dev)
+{
+ return 0;
+}
+
+U_BOOT_DRIVER(tsec_mdio) = {
+ .name = "tsec_mdio",
+ .id = UCLASS_MDIO,
+ .of_match = tsec_mdio_ids,
+ .probe = tsec_mdio_probe,
+ .remove = tsec_mdio_remove,
+ .ops = &tsec_mdio_ops,
+ .priv_auto_alloc_size = sizeof(struct tsec_mdio_priv),
+ .platdata_auto_alloc_size = sizeof(struct mdio_perdev_priv),
+};
+#endif /* CONFIG_PHYLIB */
+#endif /* CONFIG_DM_MDIO */
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index c2e755f2b1..3d75acb6b4 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -791,6 +791,7 @@ int tsec_probe(struct udevice *dev)
{
struct eth_pdata *pdata = dev_get_platdata(dev);
struct tsec_private *priv = dev_get_priv(dev);
+ struct tsec_mii_mng __iomem *ext_phyregs_mii;
struct ofnode_phandle_args phandle_args;
u32 tbiaddr = CONFIG_SYS_TBIPA_VALUE;
struct fsl_pq_mdio_info mdio_info;
@@ -800,7 +801,7 @@ int tsec_probe(struct udevice *dev)
int ret;
pdata->iobase = (phys_addr_t)dev_read_addr(dev);
- priv->regs = (struct tsec *)pdata->iobase;
+ priv->regs = dev_remap_addr(dev);
if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,
&phandle_args)) {
@@ -819,14 +820,35 @@ int tsec_probe(struct udevice *dev)
}
reg = ofnode_get_addr_index(parent, 0);
- priv->phyregs_sgmii = (struct tsec_mii_mng *)
- (reg + TSEC_MDIO_REGS_OFFSET);
+ if (reg == FDT_ADDR_T_NONE) {
+ printf("No 'reg' property of MII for external PHY\n");
+ return -ENOENT;
+ }
+
+ ext_phyregs_mii = map_physmem(reg + TSEC_MDIO_REGS_OFFSET, 0,
+ MAP_NOCACHE);
ret = dev_read_phandle_with_args(dev, "tbi-handle", NULL, 0, 0,
&phandle_args);
- if (ret == 0)
+ if (ret == 0) {
ofnode_read_u32(phandle_args.node, "reg", &tbiaddr);
+ parent = ofnode_get_parent(phandle_args.node);
+ if (!ofnode_valid(parent)) {
+ printf("No parent node for TBI PHY?\n");
+ return -ENOENT;
+ }
+
+ reg = ofnode_get_addr_index(parent, 0);
+ if (reg == FDT_ADDR_T_NONE) {
+ printf("No 'reg' property of MII for TBI PHY\n");
+ return -ENOENT;
+ }
+
+ priv->phyregs_sgmii = map_physmem(reg + TSEC_MDIO_REGS_OFFSET,
+ 0, MAP_NOCACHE);
+ }
+
priv->tbiaddr = tbiaddr;
phy_mode = dev_read_prop(dev, "phy-connection-type", NULL);
@@ -843,7 +865,7 @@ int tsec_probe(struct udevice *dev)
if (priv->interface == PHY_INTERFACE_MODE_SGMII)
priv->flags |= TSEC_SGMII;
- mdio_info.regs = priv->phyregs_sgmii;
+ mdio_info.regs = ext_phyregs_mii;
mdio_info.name = (char *)dev->name;
ret = fsl_pq_mdio_init(NULL, &mdio_info);
if (ret)
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-22 08:47:27 +0000