From patchwork Tue Nov 13 16:06:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thor Thayer X-Patchwork-Id: 10681075 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 012DF14BA for ; Tue, 13 Nov 2018 16:06:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE38C2018E for ; Tue, 13 Nov 2018 16:06:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB74827D29; Tue, 13 Nov 2018 16:06:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73D782018E for ; Tue, 13 Nov 2018 16:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=KfvqjDkeKoQVcLX+IMHDhF+Le7Cx+zvpdQwLajfKUPQ=; b=ulh1aBZTjZE8hVSPjeB9tmenb5 eYjlYKdYaDpv6AyKI75YOUb8+KsW/zRGM3NbGpyM+Ek3ungROTloAjA415elXw0BtLCPrk+2h57/j qgA5Hr8iCudyDrgTVmNkY+kufY2Oa7Wk1TvgegtDlHpn4eXxWNqV8Q9+ZjAzduMRuPYge9QIIjiWK 4/uOx/3EC4SwqN3UsysAxGkEXiXF/5OW6f+RFpzZAOm9TAob4ZmIFyj84MNs2zPkvb5YQgJCsKXA+ OGO3ClviPXBfpxv63rk1hkOclmwDLTh+AaQ9tSRDef0q+PX/AoOs4DhKhE8CVEzgFalYM5R5kJHVX UOslZkVQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMbCZ-0002xW-4G; Tue, 13 Nov 2018 16:06:07 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMbBv-0002JW-MF for linux-arm-kernel@bombadil.infradead.org; Tue, 13 Nov 2018 16:05:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=MPR1cPIEjKmhaMgBUoqN6Crcc3zliURHlcx1NsSSzKQ=; b=p8ZorriZLkUrk4mPsK/FBo4vr 4bdHzQUhi7Yl5GZVNxdSKjbcbT31mAHVnn5bmM5+oUROfbp1bpsmMLftfMW0yVHYnuMyNqYcL3lnw TdAxCXNW/jd208YnYzOEqihHJDJj4d7plY7LgUaxkDN5/t3XNb9VpJVDk0XpYsJhboTJ5Mzc0MvCy TRpbDSF1sNsL9JPPWIChOE89afraRQ2/bh1xdLYjVU5K5/Nmywm+XAZMe5gzN5AGqTXHHA16/N1uR Qs9WMYhVZj9OWNwrT6SCHwYhXay+LwfC329ElLjLsbbpB5OUfZGDeZB+jmV4IfzXk/pt+IN9Afoac NrlH/QfIQ==; Received: from mga12.intel.com ([192.55.52.136]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMbBr-0003vp-85 for linux-arm-kernel@lists.infradead.org; Tue, 13 Nov 2018 16:05:25 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2018 08:03:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,499,1534834800"; d="scan'208";a="280745444" Received: from tthayer-hp-z620.an.intel.com ([10.122.105.146]) by fmsmga006.fm.intel.com with ESMTP; 13 Nov 2018 08:03:57 -0800 From: thor.thayer@linux.intel.com To: lee.jones@linaro.org, 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 Subject: [RESEND 4/4] net: stmmac: socfpga: Convert to shared System Manager driver Date: Tue, 13 Nov 2018 10:06:14 -0600 Message-Id: <1542125174-8204-5-git-send-email-thor.thayer@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542125174-8204-1-git-send-email-thor.thayer@linux.intel.com> References: <1542125174-8204-1-git-send-email-thor.thayer@linux.intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181113_160523_615714_D5F64808 X-CRM114-Status: GOOD ( 14.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thor Thayer , arnd@arndb.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bjorn.andersson@linaro.org, olof@lixom.net, mcoquelin.stm32@gmail.com, mchehab+samsung@kernel.org, davem@davemloft.net, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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);