* [PATCH] drivers/net/ethoc: add mdio bus support
@ 2014-05-14 16:59 Franck Jullien
2014-05-16 6:03 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Franck Jullien @ 2014-05-14 16:59 UTC (permalink / raw)
To: barebox
Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
---
drivers/net/Kconfig | 1 +
drivers/net/ethoc.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 057abd2..7a0d5e1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -80,6 +80,7 @@ config DRIVER_NET_EP93XX
config DRIVER_NET_ETHOC
bool "OpenCores ethernet MAC driver"
+ select PHYLIB
help
This option enables support for the OpenCores 10/100 Mbps
Ethernet MAC core.
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index b000875..1fb6111 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -178,6 +178,8 @@ struct ethoc {
u32 num_rx;
u32 cur_rx;
+
+ struct mii_bus miibus;
};
/**
@@ -481,6 +483,54 @@ static int ethoc_send_packet(struct eth_device *edev, void *packet, int length)
return 0;
}
+static int ethoc_mdio_read(struct mii_bus *bus, int phy, int reg)
+{
+ struct ethoc *priv = bus->priv;
+ u64 start;
+ u32 data;
+
+ ethoc_write(priv, MIIADDRESS, MIIADDRESS_ADDR(phy, reg));
+ ethoc_write(priv, MIICOMMAND, MIICOMMAND_READ);
+
+ start = get_time_ns();
+ while (ethoc_read(priv, MIISTATUS) & MIISTATUS_BUSY) {
+ if (is_timeout(start, 2 * MSECOND)) {
+ dev_err(bus->parent, "PHY command timeout\n");
+ return -EBUSY;
+ }
+ }
+
+ data = ethoc_read(priv, MIIRX_DATA);
+
+ /* reset MII command register */
+ ethoc_write(priv, MIICOMMAND, 0);
+
+ return data;
+}
+
+static int ethoc_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
+{
+ struct ethoc *priv = bus->priv;
+ u64 start;
+
+ ethoc_write(priv, MIIADDRESS, MIIADDRESS_ADDR(phy, reg));
+ ethoc_write(priv, MIITX_DATA, val);
+ ethoc_write(priv, MIICOMMAND, MIICOMMAND_WRITE);
+
+ start = get_time_ns();
+ while (ethoc_read(priv, MIISTATUS) & MIISTATUS_BUSY) {
+ if (is_timeout(start, 2 * MSECOND)) {
+ dev_err(bus->parent, "PHY command timeout\n");
+ return -EBUSY;
+ }
+ }
+
+ /* reset MII command register */
+ ethoc_write(priv, MIICOMMAND, 0);
+
+ return 0;
+}
+
static int ethoc_probe(struct device_d *dev)
{
struct eth_device *edev;
@@ -493,6 +543,11 @@ static int ethoc_probe(struct device_d *dev)
priv = edev->priv;
priv->iobase = dev_request_mem_region(dev, 0);
+ priv->miibus.read = ethoc_mdio_read;
+ priv->miibus.write = ethoc_mdio_write;
+ priv->miibus.priv = priv;
+ priv->miibus.parent = dev;
+
edev->init = ethoc_init_dev;
edev->open = ethoc_open;
edev->send = ethoc_send_packet;
@@ -503,6 +558,8 @@ static int ethoc_probe(struct device_d *dev)
edev->set_ethaddr = ethoc_set_ethaddr;
edev->parent = dev;
+ mdiobus_register(&priv->miibus);
+
eth_register(edev);
return 0;
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] drivers/net/ethoc: add mdio bus support
2014-05-14 16:59 [PATCH] drivers/net/ethoc: add mdio bus support Franck Jullien
@ 2014-05-16 6:03 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2014-05-16 6:03 UTC (permalink / raw)
To: Franck Jullien; +Cc: barebox
On Wed, May 14, 2014 at 06:59:29PM +0200, Franck Jullien wrote:
> Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
Applied, thanks
Sascha
> ---
> drivers/net/Kconfig | 1 +
> drivers/net/ethoc.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 58 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 057abd2..7a0d5e1 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -80,6 +80,7 @@ config DRIVER_NET_EP93XX
>
> config DRIVER_NET_ETHOC
> bool "OpenCores ethernet MAC driver"
> + select PHYLIB
> help
> This option enables support for the OpenCores 10/100 Mbps
> Ethernet MAC core.
> diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
> index b000875..1fb6111 100644
> --- a/drivers/net/ethoc.c
> +++ b/drivers/net/ethoc.c
> @@ -178,6 +178,8 @@ struct ethoc {
>
> u32 num_rx;
> u32 cur_rx;
> +
> + struct mii_bus miibus;
> };
>
> /**
> @@ -481,6 +483,54 @@ static int ethoc_send_packet(struct eth_device *edev, void *packet, int length)
> return 0;
> }
>
> +static int ethoc_mdio_read(struct mii_bus *bus, int phy, int reg)
> +{
> + struct ethoc *priv = bus->priv;
> + u64 start;
> + u32 data;
> +
> + ethoc_write(priv, MIIADDRESS, MIIADDRESS_ADDR(phy, reg));
> + ethoc_write(priv, MIICOMMAND, MIICOMMAND_READ);
> +
> + start = get_time_ns();
> + while (ethoc_read(priv, MIISTATUS) & MIISTATUS_BUSY) {
> + if (is_timeout(start, 2 * MSECOND)) {
> + dev_err(bus->parent, "PHY command timeout\n");
> + return -EBUSY;
> + }
> + }
> +
> + data = ethoc_read(priv, MIIRX_DATA);
> +
> + /* reset MII command register */
> + ethoc_write(priv, MIICOMMAND, 0);
> +
> + return data;
> +}
> +
> +static int ethoc_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)
> +{
> + struct ethoc *priv = bus->priv;
> + u64 start;
> +
> + ethoc_write(priv, MIIADDRESS, MIIADDRESS_ADDR(phy, reg));
> + ethoc_write(priv, MIITX_DATA, val);
> + ethoc_write(priv, MIICOMMAND, MIICOMMAND_WRITE);
> +
> + start = get_time_ns();
> + while (ethoc_read(priv, MIISTATUS) & MIISTATUS_BUSY) {
> + if (is_timeout(start, 2 * MSECOND)) {
> + dev_err(bus->parent, "PHY command timeout\n");
> + return -EBUSY;
> + }
> + }
> +
> + /* reset MII command register */
> + ethoc_write(priv, MIICOMMAND, 0);
> +
> + return 0;
> +}
> +
> static int ethoc_probe(struct device_d *dev)
> {
> struct eth_device *edev;
> @@ -493,6 +543,11 @@ static int ethoc_probe(struct device_d *dev)
> priv = edev->priv;
> priv->iobase = dev_request_mem_region(dev, 0);
>
> + priv->miibus.read = ethoc_mdio_read;
> + priv->miibus.write = ethoc_mdio_write;
> + priv->miibus.priv = priv;
> + priv->miibus.parent = dev;
> +
> edev->init = ethoc_init_dev;
> edev->open = ethoc_open;
> edev->send = ethoc_send_packet;
> @@ -503,6 +558,8 @@ static int ethoc_probe(struct device_d *dev)
> edev->set_ethaddr = ethoc_set_ethaddr;
> edev->parent = dev;
>
> + mdiobus_register(&priv->miibus);
> +
> eth_register(edev);
>
> return 0;
> --
> 1.7.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-16 6:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-14 16:59 [PATCH] drivers/net/ethoc: add mdio bus support Franck Jullien
2014-05-16 6:03 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox