From: thor.thayer@linux.intel.com
To: lee.jones@linaro.org, arnd@arndb.de, dinguyen@kernel.org,
linux@armlinux.org.uk, catalin.marinas@arm.com,
will.deacon@arm.com, peppe.cavallaro@st.com,
alexandre.torgue@st.com, joabreu@synopsys.com, olof@lixom.net
Cc: davem@davemloft.net, mcoquelin.stm32@gmail.com,
mchehab+samsung@kernel.org, mark.rutland@arm.com,
bjorn.andersson@linaro.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
Thor Thayer <thor.thayer@linux.intel.com>
Subject: [RESEND PATCHv4 5/6] net: stmmac: socfpga: Use shared System Manager driver
Date: Mon, 11 Mar 2019 17:18:07 -0500 [thread overview]
Message-ID: <1552342688-6663-6-git-send-email-thor.thayer@linux.intel.com> (raw)
In-Reply-To: <1552342688-6663-1-git-send-email-thor.thayer@linux.intel.com>
From: Thor Thayer <thor.thayer@linux.intel.com>
The ARM64 System Manager requires a different method of reading
the System Manager than ARM32. A new System Manager driver was
created to steer ARM32 System Manager calls to regmap_mmio and
ARM64 System Manager calls to the new access method.
Convert from syscon to the shared System Manager driver so that
both ARM64 and ARM32 are supported.
Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
---
v2 No change to code. Update commit message.
v3 Remove the unused syscon.h header.
v4 No change - Resend add Acked-by
---
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index 5b3b06a0a3bf..d466e33635b0 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -15,7 +15,7 @@
* Adopted from dwmac-sti.c
*/
-#include <linux/mfd/syscon.h>
+#include <linux/mfd/altera-sysmgr.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_net.h>
@@ -114,7 +114,8 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
dwmac->interface = of_get_phy_mode(np);
- sys_mgr_base_addr = syscon_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
+ sys_mgr_base_addr =
+ altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
if (IS_ERR(sys_mgr_base_addr)) {
dev_info(dev, "No sysmgr-syscon node found\n");
return PTR_ERR(sys_mgr_base_addr);
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: thor.thayer@linux.intel.com
To: lee.jones@linaro.org, arnd@arndb.de, dinguyen@kernel.org,
linux@armlinux.org.uk, catalin.marinas@arm.com,
will.deacon@arm.com, peppe.cavallaro@st.com,
alexandre.torgue@st.com, joabreu@synopsys.com, olof@lixom.net
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
Thor Thayer <thor.thayer@linux.intel.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
bjorn.andersson@linaro.org, mcoquelin.stm32@gmail.com,
mchehab+samsung@kernel.org, davem@davemloft.net,
linux-arm-kernel@lists.infradead.org
Subject: [RESEND PATCHv4 5/6] net: stmmac: socfpga: Use shared System Manager driver
Date: Mon, 11 Mar 2019 17:18:07 -0500 [thread overview]
Message-ID: <1552342688-6663-6-git-send-email-thor.thayer@linux.intel.com> (raw)
In-Reply-To: <1552342688-6663-1-git-send-email-thor.thayer@linux.intel.com>
From: Thor Thayer <thor.thayer@linux.intel.com>
The ARM64 System Manager requires a different method of reading
the System Manager than ARM32. A new System Manager driver was
created to steer ARM32 System Manager calls to regmap_mmio and
ARM64 System Manager calls to the new access method.
Convert from syscon to the shared System Manager driver so that
both ARM64 and ARM32 are supported.
Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
---
v2 No change to code. Update commit message.
v3 Remove the unused syscon.h header.
v4 No change - Resend add Acked-by
---
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
index 5b3b06a0a3bf..d466e33635b0 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c
@@ -15,7 +15,7 @@
* Adopted from dwmac-sti.c
*/
-#include <linux/mfd/syscon.h>
+#include <linux/mfd/altera-sysmgr.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_net.h>
@@ -114,7 +114,8 @@ static int socfpga_dwmac_parse_data(struct socfpga_dwmac *dwmac, struct device *
dwmac->interface = of_get_phy_mode(np);
- sys_mgr_base_addr = syscon_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
+ sys_mgr_base_addr =
+ altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
if (IS_ERR(sys_mgr_base_addr)) {
dev_info(dev, "No sysmgr-syscon node found\n");
return PTR_ERR(sys_mgr_base_addr);
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-03-11 22:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 22:18 [RESEND PATCHv4 0/6] Add SOCFPGA System Manager thor.thayer
2019-03-11 22:18 ` thor.thayer
2019-03-11 22:18 ` [RESEND PATCHv4 1/6] mfd: altera-sysmgr: " thor.thayer
2019-03-11 22:18 ` thor.thayer
2019-03-11 22:18 ` [RESEND PATCHv4 2/6] Documentation: dt: socfpga: Add S10 System Manager binding thor.thayer
2019-03-11 22:18 ` thor.thayer
2019-03-11 22:18 ` thor.thayer
2019-03-11 22:18 ` [RESEND PATCHv4 3/6] ARM: socfpga_defconfig: Enable CONFIG_MTD_ALTERA_SYSMGR thor.thayer
2019-03-11 22:18 ` thor.thayer
2019-03-11 22:18 ` [RESEND PATCHv4 4/6] arm64: defconfig: " thor.thayer
2019-03-11 22:18 ` thor.thayer
2019-03-11 22:18 ` thor.thayer [this message]
2019-03-11 22:18 ` [RESEND PATCHv4 5/6] net: stmmac: socfpga: Use shared System Manager driver thor.thayer
2019-03-11 22:18 ` [RESEND PATCHv4 6/6] arm64: dts: stratix10: New System Manager compatible thor.thayer
2019-03-11 22:18 ` thor.thayer
2019-03-21 8:03 ` [RESEND PATCHv4 0/6] Add SOCFPGA System Manager Arnd Bergmann
2019-03-21 8:03 ` Arnd Bergmann
2019-03-21 8:03 ` Arnd Bergmann
2019-04-02 6:43 ` [GIT PULL] Immutable branch between MFD, ARM and Net due for the 5.2 merge window Lee Jones
2019-04-02 6:43 ` Lee Jones
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=1552342688-6663-6-git-send-email-thor.thayer@linux.intel.com \
--to=thor.thayer@linux.intel.com \
--cc=alexandre.torgue@st.com \
--cc=arnd@arndb.de \
--cc=bjorn.andersson@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dinguyen@kernel.org \
--cc=joabreu@synopsys.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=mchehab+samsung@kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=peppe.cavallaro@st.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.