From: Arun Parameswaran <arun.parameswaran@broadcom.com>
To: "David S. Miller" <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>
Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
bcm-kernel-feedback-list@broadcom.com,
Arun Parameswaran <arun.parameswaran@broadcom.com>
Subject: [PATCH v2 2/7] net: phy: Fix the register offsets in Broadcom iProc mdio mux driver
Date: Fri, 27 Jul 2018 14:23:28 -0700 [thread overview]
Message-ID: <1532726613-6483-3-git-send-email-arun.parameswaran@broadcom.com> (raw)
In-Reply-To: <1532726613-6483-1-git-send-email-arun.parameswaran@broadcom.com>
Modify the register offsets in the Broadcom iProc mdio mux to start
from the top of the register address space.
Earlier, the base address pointed to the end of the block's register
space. The base address will now point to the start of the mdio's
address space. The offsets have been fixed to match this.
Signed-off-by: Arun Parameswaran <arun.parameswaran@broadcom.com>
---
drivers/net/phy/mdio-mux-bcm-iproc.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c
index 0831b71..48bb74a 100644
--- a/drivers/net/phy/mdio-mux-bcm-iproc.c
+++ b/drivers/net/phy/mdio-mux-bcm-iproc.c
@@ -22,7 +22,7 @@
#include <linux/mdio-mux.h>
#include <linux/delay.h>
-#define MDIO_PARAM_OFFSET 0x00
+#define MDIO_PARAM_OFFSET 0x23c
#define MDIO_PARAM_MIIM_CYCLE 29
#define MDIO_PARAM_INTERNAL_SEL 25
#define MDIO_PARAM_BUS_ID 22
@@ -30,20 +30,22 @@
#define MDIO_PARAM_PHY_ID 16
#define MDIO_PARAM_PHY_DATA 0
-#define MDIO_READ_OFFSET 0x04
+#define MDIO_READ_OFFSET 0x240
#define MDIO_READ_DATA_MASK 0xffff
-#define MDIO_ADDR_OFFSET 0x08
+#define MDIO_ADDR_OFFSET 0x244
-#define MDIO_CTRL_OFFSET 0x0C
+#define MDIO_CTRL_OFFSET 0x248
#define MDIO_CTRL_WRITE_OP 0x1
#define MDIO_CTRL_READ_OP 0x2
-#define MDIO_STAT_OFFSET 0x10
+#define MDIO_STAT_OFFSET 0x24c
#define MDIO_STAT_DONE 1
#define BUS_MAX_ADDR 32
#define EXT_BUS_START_ADDR 16
+#define MDIO_REG_ADDR_SPACE_SIZE 0x250
+
struct iproc_mdiomux_desc {
void *mux_handle;
void __iomem *base;
@@ -169,6 +171,14 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
md->dev = &pdev->dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (res->start & 0xfff) {
+ /* For backward compatibility in case the
+ * base address is specified with an offset.
+ */
+ dev_info(&pdev->dev, "fix base address in dt-blob\n");
+ res->start &= ~0xfff;
+ res->end = res->start + MDIO_REG_ADDR_SPACE_SIZE - 1;
+ }
md->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(md->base)) {
dev_err(&pdev->dev, "failed to ioremap register\n");
--
1.9.1
next prev parent reply other threads:[~2018-07-27 21:23 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 21:23 [PATCH v2 0/7] Add clock config and pm support to bcm iProc mdio mux Arun Parameswaran
2018-07-27 21:23 ` [PATCH v2 1/7] dt-bindings: net: Fix Broadcom iProc mdio mux driver base address Arun Parameswaran
2018-07-28 21:09 ` Andrew Lunn
2018-07-30 22:48 ` Florian Fainelli
2018-07-31 20:47 ` Rob Herring
2018-07-27 21:23 ` Arun Parameswaran [this message]
2018-07-28 21:10 ` [PATCH v2 2/7] net: phy: Fix the register offsets in Broadcom iProc mdio mux driver Andrew Lunn
2018-07-30 22:50 ` Florian Fainelli
2018-07-27 21:23 ` [PATCH v2 3/7] arm64: dts: Fix the base address of the Broadcom iProc mdio mux Arun Parameswaran
2018-07-28 21:11 ` Andrew Lunn
2018-07-30 22:50 ` Florian Fainelli
2018-07-27 21:23 ` [PATCH v2 4/7] net: phy: Disable external master access in bcm mdio mux driver Arun Parameswaran
2018-07-28 21:13 ` Andrew Lunn
2018-07-30 22:51 ` Florian Fainelli
2018-07-27 21:23 ` [PATCH v2 5/7] dt-bindings: net: Add clock handle to Broadcom iProc mdio mux Arun Parameswaran
2018-07-28 21:15 ` Andrew Lunn
2018-07-30 22:51 ` Florian Fainelli
2018-07-31 20:48 ` Rob Herring
2018-07-27 21:23 ` [PATCH v2 6/7] net: phy: Add support to configure clock in " Arun Parameswaran
2018-07-28 0:03 ` Andrew Lunn
2018-07-30 16:47 ` Arun Parameswaran
2018-07-28 21:22 ` Andrew Lunn
2018-07-30 16:49 ` Arun Parameswaran
2018-07-30 18:04 ` Andrew Lunn
2018-07-31 17:57 ` Florian Fainelli
2018-07-27 21:23 ` [PATCH v2 7/7] net: phy: Add pm support to Broadcom iProc mdio mux driver Arun Parameswaran
2018-07-28 21:27 ` Andrew Lunn
2018-07-30 22:53 ` Florian Fainelli
2018-07-31 17:51 ` Arun Parameswaran
2018-07-28 21:32 ` [PATCH v2 0/7] Add clock config and pm support to bcm iProc mdio mux Andrew Lunn
2018-07-30 16:57 ` Arun Parameswaran
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=1532726613-6483-3-git-send-email-arun.parameswaran@broadcom.com \
--to=arun.parameswaran@broadcom.com \
--cc=andrew@lunn.ch \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=rjui@broadcom.com \
--cc=robh+dt@kernel.org \
--cc=sbranden@broadcom.com \
--cc=will.deacon@arm.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).