From mboxrd@z Thu Jan 1 00:00:00 1970 From: thor.thayer@linux.intel.com Subject: [PATCH 4/4] net: stmmac: socfpga: Use shared System Manager driver Date: Mon, 24 Sep 2018 17:09:06 -0500 Message-ID: <1537826946-18942-5-git-send-email-thor.thayer@linux.intel.com> References: <1537826946-18942-1-git-send-email-thor.thayer@linux.intel.com> Cc: thor.thayer@linux.intel.com, davem@davemloft.net, mchehab+samsung@kernel.org, catalin.marinas@arm.com, akpm@linux-foundation.org, arnd@arndb.de, aisheng.dong@nxp.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org To: lee.jones@linaro.org, peppe.cavallaro@st.com, dinguyen@kernel.org, linux@armlinux.org.uk, alexandre.torgue@st.com, joabreu@synopsys.com Return-path: Received: from mga14.intel.com ([192.55.52.115]:5955 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728244AbeIYELZ (ORCPT ); Tue, 25 Sep 2018 00:11:25 -0400 In-Reply-To: <1537826946-18942-1-git-send-email-thor.thayer@linux.intel.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Thor Thayer 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 syscon 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 --- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index 5b3b06a0a3bf..743c7f471edb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -15,6 +15,7 @@ * Adopted from dwmac-sti.c */ +#include #include #include #include @@ -114,7 +115,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