From: Florian Fainelli <florian@openwrt.org>
To: netdev@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, ian.molton@codethink.co.uk,
jason@lakedaemon.net, andrew@lunn.ch, arnd@arndb.de,
thomas.petazzoni@free-electrons.com,
gregory.clement@free-electrons.com,
Florian Fainelli <florian@openwrt.org>
Subject: [RFC PATCH 4/4] net: mvmdio: add getter and setter for PHY addresses
Date: Fri, 25 Jan 2013 11:06:49 +0100 [thread overview]
Message-ID: <1359108409-4378-5-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1359108409-4378-1-git-send-email-florian@openwrt.org>
This patch adds orion_mdio_{set,get}_phy_addr(.., port_number, phy_addr)
which is a feature available in this MDIO driver to monitor a particular
PHY address. This brings mvmdio one step closer to what is used in
mv643x_eth.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
drivers/net/ethernet/marvell/mvmdio.c | 29 +++++++++++++++++++++++++++++
include/linux/marvell_mvmdio.h | 10 ++++++++++
2 files changed, 39 insertions(+)
create mode 100644 include/linux/marvell_mvmdio.h
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c
index bdd9047..09e2470 100644
--- a/drivers/net/ethernet/marvell/mvmdio.c
+++ b/drivers/net/ethernet/marvell/mvmdio.c
@@ -32,7 +32,9 @@
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/wait.h>
+#include <linux/marvell_mvmdio.h>
+#define MVMDIO_PHY_ADDR 0x0000
#define MVMDIO_SMI_REG 0x0004
#define MVMDIO_SMI_DATA_SHIFT 0
#define MVMDIO_SMI_PHY_ADDR_SHIFT 16
@@ -188,6 +190,33 @@ static irqreturn_t orion_mdio_err_irq(int irq, void *dev_id)
return IRQ_NONE;
}
+void orion_mdio_phy_addr_set(struct platform_device *pdev,
+ int port_num, int phy_addr)
+{
+ struct orion_mdio_dev *dev =
+ platform_get_drvdata(pdev);
+ int addr_shift = 5 * port_num;
+ u32 data;
+
+ data = readl(dev->regs + MVMDIO_PHY_ADDR);
+ data &= ~(0x1f << addr_shift);
+ data |= (phy_addr & 0x1f) << addr_shift;
+ writel(data, dev->regs + MVMDIO_PHY_ADDR);
+}
+EXPORT_SYMBOL(orion_mdio_phy_addr_set);
+
+int orion_mdio_phy_addr_get(struct platform_device *pdev, int port_num)
+{
+ struct orion_mdio_dev *dev =
+ platform_get_drvdata(pdev);
+ unsigned int data;
+
+ data = readl(dev->regs + MVMDIO_PHY_ADDR);
+
+ return (data >> (5 * port_num)) & 0x1f;
+}
+EXPORT_SYMBOL(orion_mdio_phy_addr_get);
+
static int orion_mdio_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
diff --git a/include/linux/marvell_mvmdio.h b/include/linux/marvell_mvmdio.h
new file mode 100644
index 0000000..c2dfec4
--- /dev/null
+++ b/include/linux/marvell_mvmdio.h
@@ -0,0 +1,10 @@
+#ifndef _MARVELL_MVMDIO_H
+#define _MARVELL_MVMDIO_H
+
+#include <linux/platform_device.h>
+
+void orion_mdio_phy_addr_set(struct platform_device *pdev,
+ int port_num, int phy_addr);
+int orion_mdio_phy_addr_get(struct platform_device *pdev, int port_num);
+
+#endif /* _MARVELL_MVMDIO_H */
--
1.7.10.4
next prev parent reply other threads:[~2013-01-25 10:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 10:06 [RFC PATCH 0/4] net: mvmdio: close the gaps between mv643xx_eth and mvmdio Florian Fainelli
2013-01-25 10:06 ` [RFC PATCH 1/4] net: mvmdio: rename base register cookie from smireg to regs Florian Fainelli
2013-01-25 10:06 ` [RFC PATCH 2/4] net: mvmdio: do not assume SMI reg is at offset 0 of the resource Florian Fainelli
2013-01-25 10:06 ` [RFC PATCH 3/4] net: mvmdio: enhance driver to support SMI error/done interrupts Florian Fainelli
2013-01-25 10:06 ` Florian Fainelli [this message]
2013-01-25 18:16 ` [RFC PATCH 4/4] net: mvmdio: add getter and setter for PHY addresses Jason Gunthorpe
2013-01-25 19:58 ` 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=1359108409-4378-5-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=gregory.clement@free-electrons.com \
--cc=ian.molton@codethink.co.uk \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=netdev@vger.kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
/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).