From patchwork Thu Aug 2 00:53:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10553157 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 9A84513BB for ; Thu, 2 Aug 2018 00:54:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AAED2AE82 for ; Thu, 2 Aug 2018 00:54:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E4A42B11A; Thu, 2 Aug 2018 00:54:07 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 0EE5F2AE82 for ; Thu, 2 Aug 2018 00:54:06 +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=RvKhvfXqrLUsA5Gha75AKrKCDCh9mqXwUbSzcXJDZ/Y=; b=dnPvphVF7tDKI505NXM232fs8Z b/vLeU6XVIK55N/m+mKSUxmkwvK6uGlmC85jQ/l8OpLyCSAI48+NFXirdhqG78xSIljGKb7f4uMQX yhfsMD+wFi4RMjC0qgIhdNv6+JnfqMWwcehtOGWDms1ZezKOYOpQtRgwh0UkGamnkKEiQkE390HUT Fx2e7ypn69HsI2iNTgcFyvSgMXppTVEm9usblRvkPBmfhFIumBcxYCpnr8sEBtFOFs/oQUZhy6D63 QlA4oa8pha31wOxyQqRfHtPC38cMl1mLJ0CfKooDCv1G34nj1dUmj+gG9fVjDUeFJCmJaY0/6wRvE KKOf4q9Q==; 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 1fl1sP-0004bE-60; Thu, 02 Aug 2018 00:54:01 +0000 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fl1sE-0004Ol-5t for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 00:53:51 +0000 Received: by mail-qt0-x241.google.com with SMTP id a5-v6so563635qtp.2 for ; Wed, 01 Aug 2018 17:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=189DY+gaLXQRLRw2y8y5yRwb7CdtbfhSBM5/gsjAGqM=; b=GPnZhXC5E7pNxlqWEX9IMy4v2CydY8Z4zIYGhv5hW21N84zsjYbUAA4R0ZV4ftRDZe 9W1ibYCaeuaUscOEjyLKR+m2LJw7bFR1dTMVeMis6YJmiPFDE6nakeWxDNbc8zlhWIZV a9YjIdbrxWElY+C/5GiGpVxUPyWeZBlT44hBU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=189DY+gaLXQRLRw2y8y5yRwb7CdtbfhSBM5/gsjAGqM=; b=Gi5M0HfjYJwG+pSkhfo0mEUahUUUiScAQ+iuvuC69aaPsFJmBjNQyF3HQLxnX7y4fO Y4nieXt7P03LdNzXDj+C6hVRVVWLgaMY91bk8CaCr6c6HiP/i5N8nLYt1BHLmNvN8SYC rqXggxrCjgkYjE12KGcnNwLcliF+JBfD7JoPcfmpBA6axemwAqO8dndOfI0jMLaX3kHI x0nMIFz4/2ZOa4gpRceLhNizRDW6NLtyBWqal6jhw5IHOtCUKJ8i/sqCFFFpgH6a6Ht0 8Phnwure4qH/fZr6Y+PWPQEoER+xY7FcggP6ciQVgb8zFxNqXdz6c6DTGu5Pp8tY14lX fEBw== X-Gm-Message-State: AOUpUlHttRDYOJn8CqMX32qrxBU5DhzjDXoNGeV4f2WPi7evD3TuuFzt ZYdDvxVhfaS/Rfxw8SyhlXS5kQ== X-Google-Smtp-Source: AAOMgpfAtu0kop0nh9fRCRAbCx0MbQV9hL5Uw+ib4/e75LjCTz2em6Xq8+MINlVcpNYExegu61cZQQ== X-Received: by 2002:a0c:c3c6:: with SMTP id p6-v6mr641296qvi.146.1533171220963; Wed, 01 Aug 2018 17:53:40 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e81-v6sm325116qka.3.2018.08.01.17.53.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 17:53:40 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v4 1/8] dt-bindings: net: Fix Broadcom iProc mdio mux driver base address Date: Wed, 1 Aug 2018 17:53:46 -0700 Message-Id: <1533171233-14557-2-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_175350_221463_7E72B4FD X-CRM114-Status: GOOD ( 15.25 ) 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: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 Modify the base address of the Broadcom iProc MDIO mux driver to point to the start of the block's register address space. Signed-off-by: Arun Parameswaran Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt b/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt index dfe287a..dc8aa68 100644 --- a/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt +++ b/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt @@ -18,9 +18,9 @@ at- Documentation/devicetree/bindings/net/mdio-mux.txt for example: - mdio_mux_iproc: mdio-mux@6602023c { + mdio_mux_iproc: mdio-mux@66020000 { compatible = "brcm,mdio-mux-iproc"; - reg = <0x6602023c 0x14>; + reg = <0x66020000 0x250>; #address-cells = <1>; #size-cells = <0>; From patchwork Thu Aug 2 00:53:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10553155 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 A888A174A for ; Thu, 2 Aug 2018 00:54:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93A782AE82 for ; Thu, 2 Aug 2018 00:54:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81E1E2B11A; Thu, 2 Aug 2018 00:54:05 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 102212AE82 for ; Thu, 2 Aug 2018 00:54:04 +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=N9suk1yUwnN5H6QfLnEIGbJHSxDDwtuEt76/puGD9RQ=; b=dpihXh/6TS7/ccXyH8VFnxM7Y0 v8k8Zel/bGZAh7gYduHQF7YnkqgmFmI7lk3HYXHiHs4W5RF582YufiW/wEdyxENxme2Uhotwja0Uk mM8OO+RrrsrT2icJQEhlEmGYi36bv/OuQ7WtZiUBuzRQfNfEbEvqgPe6trzI0usvkAmzqqLGRGeZi BclLgOqZ4hGP7DfbXtKG6YrbkpqcUfFiPilNVTVPCxBp8/iBk+b2pXeHMCfE6OH6cGglcB/k9hPPb fOU9gGTC11H0cSoVpiJre+qhtTb2QR1zM84F8tDwnPJLFgKpWfo3Pmop9HzXJel3eYQE9OFeJM1SJ XgZduQuw==; 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 1fl1sI-0004SN-7L; Thu, 02 Aug 2018 00:53:54 +0000 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fl1sE-0004PB-5j for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 00:53:51 +0000 Received: by mail-qt0-x241.google.com with SMTP id b15-v6so503500qtp.11 for ; Wed, 01 Aug 2018 17:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VsjrZXC5OpUj/mRiqlhQAUbom/HbTgymFwHCvgsVH+Q=; b=DVmxEOUYOHzrEWaNwNqxrjCBhcbHLa9zr8AAQd246c+q6pGHg6yCXVKHxLVXb7jGPX WOstrBxw6kjm3pxUB/wfVKzK+cNa8uDbFgaU9pQFOCw60q+J7kKP2ZW+DCxpHYvEEkCu XkUoDC1wJ6CYcoLxqw9yflFbYhgy6RYUKq21o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VsjrZXC5OpUj/mRiqlhQAUbom/HbTgymFwHCvgsVH+Q=; b=n344PFjF9JJCOGXag0S0sUC5o0jii/IBm6mBAcBew5Hxlvn3O73+d3D8nz9m0pUBCY K8otpthjdCUIYmb8IfedTAqX3JBTYRrsC8PM5cZxfOHs5sCr5j7bncORWWtwIhXsLs48 qFN3r0BHnl53jvp93FP6H6mZBvB4X/eDQ2UZun8pgGw/8wf0H+yNnZbhRS2ofBqFJZrW RkMtscfvR9DxPrCQ9gem9JHllwH1gw/zZGYxFypE7J3dhU+FXQOFZdQ3x5uTxsiEpzI3 oFLKsRCOgLggWOMbv8xB8aiH640o73puBeP3jmqPwscL1jKAGp5bBOgA//bze3uqYH8G DBGA== X-Gm-Message-State: AOUpUlGFyWWuuLriag+tbGTf+T0PvV6Gj9ZsK4GsakcI4Nu+/Qknt+HM ML+OJ4doutm+fRdm20ZOTQHCLQ== X-Google-Smtp-Source: AAOMgpd6FLlQOIZ4d1/DI2VKP8vuXtMASY02S7UDSIAeC/nWKPYiD4hdVV28hz+cSKMO+s/4bCz94w== X-Received: by 2002:a0c:aa06:: with SMTP id d6-v6mr649834qvb.26.1533171224345; Wed, 01 Aug 2018 17:53:44 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e81-v6sm325116qka.3.2018.08.01.17.53.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 17:53:43 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v4 2/8] net: phy: Fix the register offsets in Broadcom iProc mdio mux driver Date: Wed, 1 Aug 2018 17:53:47 -0700 Message-Id: <1533171233-14557-3-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_175350_218139_7ABE399C X-CRM114-Status: GOOD ( 18.27 ) 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: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 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 Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- 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 #include -#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"); From patchwork Thu Aug 2 00:53:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10553161 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 2B39113BB for ; Thu, 2 Aug 2018 00:54:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B2502B11A for ; Thu, 2 Aug 2018 00:54:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E0982B295; Thu, 2 Aug 2018 00:54:33 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 A70792B11A for ; Thu, 2 Aug 2018 00:54:32 +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=qUw1VCYz7JFqRtLUdfn89qisYP77qQumLYMiJc6nsW8=; b=BGgvmjLrgDxisVO7Fe+zwAt87E g2JZNPCSKAh2it80PwUmuFHKByY12HlP2pk85Rn83IWJ9ePcd8mpjQ+jArxh/S8dx+5/4q9WyRWcq 6+Xy7F7jkIje+0emHrHAyFXbNa14Bkq8vVf+iyF/xoCz550ZDbxrhH4fH7mbG/21SxhIKlPXPI6FA QcYhKGR0S1DPPHiKcajd0xwalVBRrBErrxYsT/hNgW6rX/XRlg31oO8MZdY6M7tiuejhUMFI/O4sf EcqdLvE/xqEDbMZwuMxjkuXy8hWjT194oQmGgHqTBs/Xeq42zFAvr12fLbfITeJlPYKPXHs/CYb+j n8VkkT+A==; 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 1fl1sn-0005Cx-A8; Thu, 02 Aug 2018 00:54:25 +0000 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fl1sM-0004Q6-Pf for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 00:54:02 +0000 Received: by mail-qt0-x244.google.com with SMTP id d4-v6so489936qtn.13 for ; Wed, 01 Aug 2018 17:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RwD94yFvz8u5xZo/C2EuBOqHrdsbi50cG7BNSdHptbM=; b=cppJ0kOIVzLMf0MZux43INfyV75v/Z05Ywel3f8AAJHLHxIkVlnNBwufWDLQmIKoMI IHsaC7XPXspKi7rBOr274t9S4l5j9drPua2x/Sh6l6HbTIJLLrxeUXNXm1faVD51iUHh RH4I+j4PDEEmrAmO53rNyXE0aDhdnvJUfxuac= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RwD94yFvz8u5xZo/C2EuBOqHrdsbi50cG7BNSdHptbM=; b=qb8UivtAjUi5EJLfKqeQKgD2RBuMT5kHSTphJh8ZH9al+t+PNhQjMn+0voe/Tl8s1v sHM6a0KYmXpsTH8t4k23hBnvqTYH4Kq9N9XzREMf69E09shXU7Po18yZ050qlVIl/4ZA U//RBnQlV01eBVr1XbdfJcDHEfb4JBY0TgTHYxwbK7Br0l85Z7bir6AmgHYUHQe0ac8Q Cc/rPEpb/wA+KPOylROll30uiu9uv8N7TRhXeBOIzXnlEqUnfpcKrrcNi5kj2Bo8yFV0 KaeMfO+FgiVPYFMki2pideaCf/8H8TIHzlTVkpMvX5srmCxoiCFk/I7cF6hUfQN58mcr 18ag== X-Gm-Message-State: AOUpUlF1ySFHkaWPfbvFMhfzAZ+aHA0uu53+FNBDLZSxbWXmu30MvNY7 dAkF+5YOLEmE5WhA44kwzoyX7w== X-Google-Smtp-Source: AAOMgpcKLzh6aTraINUuA+9k63n1iy2uW84lTjGW8lVE4vHY6fP5T9VQBZ19NxqSY363B2FP0qMYDw== X-Received: by 2002:a0c:b587:: with SMTP id g7-v6mr647737qve.94.1533171227701; Wed, 01 Aug 2018 17:53:47 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e81-v6sm325116qka.3.2018.08.01.17.53.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 17:53:47 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v4 3/8] arm64: dts: Fix the base address of the Broadcom iProc mdio mux Date: Wed, 1 Aug 2018 17:53:48 -0700 Message-Id: <1533171233-14557-4-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_175359_252865_AD197489 X-CRM114-Status: GOOD ( 14.76 ) 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: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 Modify the base address of the mdio mux driver to point to the start of the mdio mux block's register address space. Signed-off-by: Arun Parameswaran Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 ++-- arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi index 4057197..1a406a7 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -482,9 +482,9 @@ status = "disabled"; }; - mdio_mux_iproc: mdio-mux@6602023c { + mdio_mux_iproc: mdio-mux@66020000 { compatible = "brcm,mdio-mux-iproc"; - reg = <0x6602023c 0x14>; + reg = <0x66020000 0x250>; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi index b203152..a70e8dd 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi @@ -278,9 +278,9 @@ #include "stingray-pinctrl.dtsi" - mdio_mux_iproc: mdio-mux@2023c { + mdio_mux_iproc: mdio-mux@20000 { compatible = "brcm,mdio-mux-iproc"; - reg = <0x0002023c 0x14>; + reg = <0x00020000 0x250>; #address-cells = <1>; #size-cells = <0>; From patchwork Thu Aug 2 00:53:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10553179 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 358FE13B4 for ; Thu, 2 Aug 2018 01:05:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25A31298AA for ; Thu, 2 Aug 2018 01:05:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 155A12B513; Thu, 2 Aug 2018 01:05:27 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 92CFD298AA for ; Thu, 2 Aug 2018 01:05:26 +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=qaNvnaMmEcgYfJy6Cshg0J4B8ilKZ3sDB1V51g3Nh5I=; b=InM73pzxs7zgywq70hUNTyT+Vr 1ylHHu0REHlgwcVLAvUDUNWrVlQvZqw22GggQjC6syQhIreQ+8xMurS3iwZrj+YgAWEHiQZiGHOBv aQ/PEvSnPb6PCL8PW9H2mNj1LAmXUWa+Q0MzGjZjwtMXHSU8DCdA1QCYlxk7b2d8KzHHN9wsBShR+ Irqq9T/ttmoaQv/VjY+5TQ3oIzl0EBU3DB5krlDy9cjahrQ951aLz/vpxTbIVy5dLdSOoBws7q6BP B+CLn8G7bUQmZQyp8Zut0vFZ3yu1VCyM8iOL9IgbpK7pxhWcJgXjZ4Gyhlo9734cwtJSJtQVpdhHg 7DmRdYfg==; 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 1fl23R-0002kg-34; Thu, 02 Aug 2018 01:05:25 +0000 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fl1sQ-0004RA-6S for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 00:54:07 +0000 Received: by mail-qk0-x244.google.com with SMTP id 26-v6so422296qks.9 for ; Wed, 01 Aug 2018 17:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Nf12dmutfgCfp/0jaiDAW47A5xaVfjlLX5su1g70bm4=; b=XYU820zg1XHKnPlftT/nf8r+l7YBOPuDJ5zMrvEnp7kJ0PnUxT62LLTSaatdW4Sj24 EXGQI+goI6WOaq/ssTyesoItgHbRUm4XXikraaj41Rj58sHf8sUjiAP94M/4mnRs3SVS JydIKAlzn9Qd9wYTybwlU795Tl7msV4dFy4WM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Nf12dmutfgCfp/0jaiDAW47A5xaVfjlLX5su1g70bm4=; b=g4hT81nXaXG5j9eYHIGSdyECvz4jlMVgXDkX+xRarfyRc48DG2JU1ltHZEmsiL+GNG NqlNamjZv5Urp6+30TwhuzoVfkvVxPMVm+cguf9K5dEdHjwXgAy2wgdb9BfZ5K6xx6bK sdpkX7Vz/MX+M+xJzWXMkU2v8ziYztVxnaGvOdoktkl6Q2f5f9Zju02tWtM+UbNAvSi8 wDLOD6ezbBfRZJTWBSCClkkdWz9LzXCILrScjAGng0fJbF+SMRe71bOwPX2UEj3zgwMN kwYfLQuP91RelCHSnp7FRs3ET/HcgpPDYbV2VXJ6Hb/jg4+6MTeee43etdjP7THJVyxE okVg== X-Gm-Message-State: AOUpUlEgZ3yBF8LsSvmrlOoJvrh9r9rlrpCi7tHAoBq90wGvI6QSHzjm BWuD2PXXj+b9jDjoZrNyv8wwbg== X-Google-Smtp-Source: AAOMgpf6yAKLaGbJlL9DM5N3NhcgVYe2C2w+WNGe1GOGuLlWoTQuMaLY6kx+qbZWXoiwjLpHi1FuYw== X-Received: by 2002:a37:de1a:: with SMTP id h26-v6mr595757qkj.442.1533171231073; Wed, 01 Aug 2018 17:53:51 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e81-v6sm325116qka.3.2018.08.01.17.53.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 17:53:50 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v4 4/8] net: phy: Disable external master access in bcm mdio mux driver Date: Wed, 1 Aug 2018 17:53:49 -0700 Message-Id: <1533171233-14557-5-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_175402_847344_A98B2FE8 X-CRM114-Status: GOOD ( 15.26 ) 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: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 Configure the scan control register in the Broadcom iProc mdio mux driver to disable access to external master. In some SoC's, the scan control register defaults to an incorrect value. Signed-off-by: Arun Parameswaran Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- drivers/net/phy/mdio-mux-bcm-iproc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index 48bb74a..c36ce4b 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -22,6 +22,9 @@ #include #include +#define MDIO_SCAN_CTRL_OFFSET 0x008 +#define MDIO_SCAN_CTRL_OVRIDE_EXT_MSTR 28 + #define MDIO_PARAM_OFFSET 0x23c #define MDIO_PARAM_MIIM_CYCLE 29 #define MDIO_PARAM_INTERNAL_SEL 25 @@ -53,6 +56,16 @@ struct iproc_mdiomux_desc { struct mii_bus *mii_bus; }; +static void mdio_mux_iproc_config(struct iproc_mdiomux_desc *md) +{ + u32 val; + + /* Disable external mdio master access */ + val = readl(md->base + MDIO_SCAN_CTRL_OFFSET); + val |= BIT(MDIO_SCAN_CTRL_OVRIDE_EXT_MSTR); + writel(val, md->base + MDIO_SCAN_CTRL_OFFSET); +} + static int iproc_mdio_wait_for_idle(void __iomem *base, bool result) { unsigned int timeout = 1000; /* loop for 1s */ @@ -216,6 +229,8 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) goto out_register; } + mdio_mux_iproc_config(md); + dev_info(md->dev, "iProc mdiomux registered\n"); return 0; From patchwork Thu Aug 2 00:53:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10553165 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 4A042174A for ; Thu, 2 Aug 2018 00:55:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 399FA2B11A for ; Thu, 2 Aug 2018 00:55:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CB4C2B295; Thu, 2 Aug 2018 00:55:06 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 D28342B11A for ; Thu, 2 Aug 2018 00:55:05 +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=o+332X5vl6XB368TdQnxKeDg6lKO5bxEArdVz7PMABc=; b=MZ8e1HH4eFyGcwKY1rvTRoFdWc TzIev6swSfeK8sKL3s3p90V3sqelI6S9SsEjdcIzHYsUQ9f0hXGQ9AcOaAb6NqXANlfQaCtqmeuQ1 SSEew6waba6jLlIx7fxbdQH1eXe4deinbe0rNdN3yfzKBzCuhn2UzX012ZK4TFpLN1r3Nyo6+O1qr CUmBm3P4xGjC8kj0G3ezmCYA4t/nArwRmgXgUipgIm3a8DGyiYuIOq3672Nleby70xnUhLhNbaC94 8jsB1oHmlUwMZfaavfOBeptefMUDTa1v4V1BDmdkLyfa5b4HAjVAxAlv2eQ5vF+X9k7RMIgPZ3MZF gDZKRFgw==; 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 1fl1tK-00060Y-GF; Thu, 02 Aug 2018 00:54:58 +0000 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fl1sT-0004Sz-AN for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 00:54:12 +0000 Received: by mail-qt0-x241.google.com with SMTP id y19-v6so541870qto.5 for ; Wed, 01 Aug 2018 17:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=27NQGqCuJeCZzYDzyqMtf4gclMxWU9BJMx0JatVN93M=; b=E1ZGKzuyLwXdkbCF9PRa0754sL7wKat2ynufKI/WLe7BeVS3f4I2UCPplLXPcGlixU Tjg8acoB/22G94yG+zLvExTV5xi3osjReQxPc9f1WkEqcICklkfMvv3xRQV15P0gHgwd PbwvZsoV3+yxQtuBNwcd+Z9iStj5V0soXW1DI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=27NQGqCuJeCZzYDzyqMtf4gclMxWU9BJMx0JatVN93M=; b=Cw+2j/gkM5vNS61wZLCl4+Zb4Hg6fznXaVL49JADxfeNuxA3B8Vu3J5oEKHNCj7LS+ VlXXG4Hf06qyRlLW26T//IO/1vGiTW2bVwCoBboqInfPGkUw0PWamwKa0sBwJO/zpvwj XSyZSYjPWChqFx4LKxbZk/lm9ksyLe8F3f9y29TkP12EV0JdMpeRX+c9xKZmJ4HzZVdU x5k1z+LA9vuS8crhTXLqkB7yZSR8alv8YPYNPKha+SBaZxeUz484zn5OxjqZZ3xVh2aw h1O7yGuQvrcMKTMiiZe3GGubuq3w7apPpFuz7eUR+xnacz0hpTi/u9uxgNgcw6vSK/Nw FgXQ== X-Gm-Message-State: AOUpUlEZiJRWpYp+J8S39D1b83j4SPC82+mwDXAKKmBiJwpqzhGHRNgU KLKQ14DFwJGV20loiiUYUuKzcw== X-Google-Smtp-Source: AAOMgpdpPS1QTP6WNym13vW/yroJQNS6bssvnZXJ22Xt9X1gpC00mIqKaXamtrtPK/HpGs0mlgeIGA== X-Received: by 2002:a0c:d21d:: with SMTP id m29-v6mr650053qvh.86.1533171234515; Wed, 01 Aug 2018 17:53:54 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e81-v6sm325116qka.3.2018.08.01.17.53.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 17:53:53 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v4 5/8] net: phy: Use devm api for mdio bus allocation in bcm iproc mdio mux Date: Wed, 1 Aug 2018 17:53:50 -0700 Message-Id: <1533171233-14557-6-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_175406_028963_C2E2C220 X-CRM114-Status: GOOD ( 16.62 ) 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: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 Use devm_mdiobus_alloc() instead of mdiobus_alloc() in the Broadcom iProc mdio mux driver. Signed-off-by: Arun Parameswaran Reviewed-by: Florian Fainelli --- drivers/net/phy/mdio-mux-bcm-iproc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index c36ce4b..3ba9616 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -198,7 +198,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) return PTR_ERR(md->base); } - md->mii_bus = mdiobus_alloc(); + md->mii_bus = devm_mdiobus_alloc(&pdev->dev); if (!md->mii_bus) { dev_err(&pdev->dev, "mdiomux bus alloc failed\n"); return -ENOMEM; @@ -217,7 +217,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) rc = mdiobus_register(bus); if (rc) { dev_err(&pdev->dev, "mdiomux registration failed\n"); - goto out; + return rc; } platform_set_drvdata(pdev, md); @@ -236,8 +236,6 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) out_register: mdiobus_unregister(bus); -out: - mdiobus_free(bus); return rc; } @@ -247,7 +245,6 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev) mdio_mux_uninit(md->mux_handle); mdiobus_unregister(md->mii_bus); - mdiobus_free(md->mii_bus); return 0; } From patchwork Thu Aug 2 00:53:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10553163 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 1433F174A for ; Thu, 2 Aug 2018 00:54:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03EF92B11A for ; Thu, 2 Aug 2018 00:54:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC5802B295; Thu, 2 Aug 2018 00:54:51 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 976612B11A for ; Thu, 2 Aug 2018 00:54:51 +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=JMr50vwxJ4qJ1ezf045JWLus6XsDUTZTI6X7NkmMKXg=; b=hgoMByCB0xZwhSWgfwjRSihXHp zHVRyOymPedxah52Q20nXHspFNwYs2hSk5fnnG6asL3HkBGIUNE9sZ1y/DadT6Nps7oaZcvgMP8Mn czNL0CF+GEM+k1L/rxACTCSNiqgim2odkoujsthYawiubcP7d5vLL3FXjzDE7YkIO09ORsJp/Ml/O BXGrFjmpxKhRqQTSdO9k/S5Rtcb/pnsjJv9hgxkx3zXAAHMTLJ63DRsKJ43ezufKsG1M3KmAQT9hG X4mHzq9d0MxjVobmEtan8wAPKLlQuSACx35UBIysNZBkaQEGBI/lNiNhzFq/V/mQxJRZyHpZSNIXT ln2LokKQ==; 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 1fl1t8-0005kd-Vl; Thu, 02 Aug 2018 00:54:46 +0000 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fl1sT-0004XW-AT for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 00:54:10 +0000 Received: by mail-qt0-x241.google.com with SMTP id z8-v6so516813qto.9 for ; Wed, 01 Aug 2018 17:53:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UBoiA9B2sqMzS5oHoGN2NkkLQkeS/0hG8NCGBeKGHho=; b=iPzvOZEBHxE8wEyJxi62uZXlspRqQnEmirxIr1ZnJM0q8m72RooA0WlAHu9hN1xnDN pZm/rGgKz+msbpuSkKQQ81HepTF8dUCe/wCx1HaORsmHwEod5wbUlKwLPwIVLaJErMZw mGlgkRh5q9AjZoKGDiVnIZ87F380VhLbir3wo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UBoiA9B2sqMzS5oHoGN2NkkLQkeS/0hG8NCGBeKGHho=; b=n5voCrm1Ax4p9Yt12x4I/My3vNOUDU3s7qZnvCCx8doXom07mbH8tBfyw6LYfBKL+T 7Xy4OtHZwKYs+hMjkGk+fdj9m0j4ZI6Hnnbam6Hv2O3ftewChM1Jf3JsnfmwKquielWU hs9Eb8ytiKkoQi6eC/wT7vXJYCD1MAy+gl32JWazJE5QPaBlZAnuog+YyHPi/JrV/UFo mefudVdPfNPCPwV44rf/hvswW+ZxsDdzrjUAqQAvnyE8NZTTKV0c53zTS4tUu/UvRvn+ ahDbRJI91HAjdgpjgJaYr/MvqaRVR1hWUhvQ7hXpqkdE6Wl7vylsF7BPzcgAFtAnFQtA NF+g== X-Gm-Message-State: AOUpUlEKZ5ms+z1SIxkUtLazQNeAARR/3LWlLosidwb5sbp8twPqtP2H ++y/oaHD5Gzs4g7i0D0u9LiwSQ== X-Google-Smtp-Source: AAOMgpfYTbbv+nxQ0q0Jm+8UsKdc9J5J7CM4PSMMM8RBMvDNDz1s3/fojIYiqoy8ki/geftffSzwow== X-Received: by 2002:a0c:afb8:: with SMTP id s53-v6mr638185qvc.164.1533171237886; Wed, 01 Aug 2018 17:53:57 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e81-v6sm325116qka.3.2018.08.01.17.53.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 17:53:57 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v4 6/8] dt-bindings: net: Add clock handle to Broadcom iProc mdio mux Date: Wed, 1 Aug 2018 17:53:51 -0700 Message-Id: <1533171233-14557-7-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_175405_976430_7E51E391 X-CRM114-Status: GOOD ( 14.31 ) 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: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 Add clock phandle, of the core clock driving the mdio block, as an optional property to the Broadcom iProc mdio mux. The clock, when specified, will be used to setup the rate adjust registers in the mdio to derrive the mdio's operating frequency. Signed-off-by: Arun Parameswaran Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt b/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt index dc8aa68..b58843f 100644 --- a/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt +++ b/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt @@ -13,6 +13,9 @@ MDIO multiplexer node: Every non-ethernet PHY requires a compatible so that it could be probed based on this compatible string. +Optional properties: +- clocks: phandle of the core clock which drives the mdio block. + Additional information regarding generic multiplexer properties can be found at- Documentation/devicetree/bindings/net/mdio-mux.txt From patchwork Thu Aug 2 00:53:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10553169 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 552EC14E2 for ; Thu, 2 Aug 2018 00:55:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 449B42B11A for ; Thu, 2 Aug 2018 00:55:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 377EE2B295; Thu, 2 Aug 2018 00:55:29 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 C3E4B2B11A for ; Thu, 2 Aug 2018 00:55:28 +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=ZYNtuVM+kqGpkcLhhVkD2Q5PFLnsoOr0YMT1Src27hk=; b=kA3Xd/9TxgyTA6FCAMRbayTbjt FLTuSEqrQgRkJKV811WAPPO2kgMeN43hsjZTfsqbWTjEGpvNKG6L+Li7EtL9+FX+Yy9joImkfqx9o 81a4bf2VaODOGIkittNkbwWp0Bfzhpqc6lzEe/phq2qqDJDuuruvy6RwG0Y/LIC1+m7tNS3b+/ZFb JxpYa8jhq0nk6rC6hemiziL5MB2EQSGeO6fPvtopjYPPOVNqqtT76d4aU7ZEbz6bgafMPycA8TEJ4 ehrnUbvs549ACoMY3CSBsX6Y5RaX64Ez2rrigeGk6n6+UnM4d8sbS5+ckojUgKZU0O5Mpqqy6k2oT 7kpyERHw==; 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 1fl1tk-0006iB-9z; Thu, 02 Aug 2018 00:55:24 +0000 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fl1sa-0004d5-Bs for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 00:54:19 +0000 Received: by mail-qt0-x244.google.com with SMTP id h4-v6so529965qtj.7 for ; Wed, 01 Aug 2018 17:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8J6/E5DOdpzfUXnnAqdehMeunvpbQEWEvs4XzhoSLhM=; b=Y1QhijyF/0FEGSt6ebXo51NoscfwxhPvmVEWW5QQtxiISUZ0Oo/P5BbdxNtiD5zjOj b36E7rciHZuap/ewYq438GbxLqLGWS6GEoFHU8R6FLQsBf30U40FDSisJJ2A+9k5xgP3 bukJ2PFNcm8Jcfa9BpoSyJkfFTRMNpWEOsGS4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8J6/E5DOdpzfUXnnAqdehMeunvpbQEWEvs4XzhoSLhM=; b=AZh3Wmvxsfff1q/y7juwpq7YVR0zopXSDTZh43094Dr0zLjpF43e2y/Hogu3z7o4tV xRHOAKmj+C5g9nY3X+g8yZzhZJ6m6q1DoaMf9zT8xYTbp1Xa7vmX12xvT7JLsAw3cfYs zhbQ1OK9OTV/bhpUy0JUt4/EzQwdOf4MCrPWRvsumotGrkarlTQazsCNWrmqzoWEaTkh afKq/RCWIMUA8gDNAnLcfUQwMjxZSU/8Qe9ekBeGNf6OMRpQZZuYbcavsnIzkNeWKha2 QhnIhvcmjM6x8Dd/7ZqU47R3SiWS61FMTxo8mwPCETHP/r/XNsYSwFsiRMlt6i636nnO F1PA== X-Gm-Message-State: AOUpUlHWUfFDxG0AvcUDw5byMMNHIYbOZQnY2Pnb/PwPEM4vV7LxG6ee GG9Hx0z4L/+0xEZSts9BpK0Rgg== X-Google-Smtp-Source: AAOMgpetCaWDQ2/TePDuTSovLx1xa7fLg0A3hqouBZ5Q2w+h3/iYLsSLYwGuWXvtR2VPhe/1cunoNQ== X-Received: by 2002:ac8:37c2:: with SMTP id e2-v6mr593938qtc.417.1533171241252; Wed, 01 Aug 2018 17:54:01 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e81-v6sm325116qka.3.2018.08.01.17.53.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 17:54:00 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v4 7/8] net: phy: Add support to configure clock in Broadcom iProc mdio mux Date: Wed, 1 Aug 2018 17:53:52 -0700 Message-Id: <1533171233-14557-8-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_175413_171487_A0D7393F X-CRM114-Status: GOOD ( 19.76 ) 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: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 Add support to configure the internal rate adjust register based on the core clock supplied through device tree in the Broadcom iProc mdio mux. The operating frequency of the mdio mux block is 11MHz. This is derrived by dividing the clock to the mdio mux with the rate adjust register. In some SoC's the default values of the rate adjust register do not yield 11MHz. These SoC's are required to specify the clock via the device tree for proper operation. Signed-off-by: Arun Parameswaran Reviewed-by: Florian Fainelli --- drivers/net/phy/mdio-mux-bcm-iproc.c | 41 ++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index 3ba9616..c608e3c4 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * version 2 (GPLv2) along with this source code. */ - +#include #include #include #include @@ -22,6 +22,10 @@ #include #include +#define MDIO_RATE_ADJ_EXT_OFFSET 0x000 +#define MDIO_RATE_ADJ_INT_OFFSET 0x004 +#define MDIO_RATE_ADJ_DIVIDENT_SHIFT 16 + #define MDIO_SCAN_CTRL_OFFSET 0x008 #define MDIO_SCAN_CTRL_OVRIDE_EXT_MSTR 28 @@ -49,21 +53,38 @@ #define MDIO_REG_ADDR_SPACE_SIZE 0x250 +#define MDIO_OPERATING_FREQUENCY 11000000 +#define MDIO_RATE_ADJ_DIVIDENT 1 + struct iproc_mdiomux_desc { void *mux_handle; void __iomem *base; struct device *dev; struct mii_bus *mii_bus; + struct clk *core_clk; }; static void mdio_mux_iproc_config(struct iproc_mdiomux_desc *md) { + u32 divisor; u32 val; /* Disable external mdio master access */ val = readl(md->base + MDIO_SCAN_CTRL_OFFSET); val |= BIT(MDIO_SCAN_CTRL_OVRIDE_EXT_MSTR); writel(val, md->base + MDIO_SCAN_CTRL_OFFSET); + + if (md->core_clk) { + /* use rate adjust regs to derrive the mdio's operating + * frequency from the specified core clock + */ + divisor = clk_get_rate(md->core_clk) / MDIO_OPERATING_FREQUENCY; + divisor = divisor / (MDIO_RATE_ADJ_DIVIDENT + 1); + val = divisor; + val |= MDIO_RATE_ADJ_DIVIDENT << MDIO_RATE_ADJ_DIVIDENT_SHIFT; + writel(val, md->base + MDIO_RATE_ADJ_EXT_OFFSET); + writel(val, md->base + MDIO_RATE_ADJ_INT_OFFSET); + } } static int iproc_mdio_wait_for_idle(void __iomem *base, bool result) @@ -204,6 +225,19 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) return -ENOMEM; } + md->core_clk = devm_clk_get(&pdev->dev, NULL); + if (md->core_clk == ERR_PTR(-ENOENT) || + md->core_clk == ERR_PTR(-EINVAL)) + md->core_clk = NULL; + else if (IS_ERR(md->core_clk)) + return PTR_ERR(md->core_clk); + + rc = clk_prepare_enable(md->core_clk); + if (rc) { + dev_err(&pdev->dev, "failed to enable core clk\n"); + return rc; + } + bus = md->mii_bus; bus->priv = md; bus->name = "iProc MDIO mux bus"; @@ -217,7 +251,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) rc = mdiobus_register(bus); if (rc) { dev_err(&pdev->dev, "mdiomux registration failed\n"); - return rc; + goto out_clk; } platform_set_drvdata(pdev, md); @@ -236,6 +270,8 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) out_register: mdiobus_unregister(bus); +out_clk: + clk_disable_unprepare(md->core_clk); return rc; } @@ -245,6 +281,7 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev) mdio_mux_uninit(md->mux_handle); mdiobus_unregister(md->mii_bus); + clk_disable_unprepare(md->core_clk); return 0; } From patchwork Thu Aug 2 00:53:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10553167 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 B07C713BB for ; Thu, 2 Aug 2018 00:55:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F6E42B11A for ; Thu, 2 Aug 2018 00:55:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9383C2B295; Thu, 2 Aug 2018 00:55: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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 25E272B11A for ; Thu, 2 Aug 2018 00:55: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=L0Qvos+m8NTnXGBtUkVO1yiloRneaprsH9JE8u7qBRc=; b=N+kZI0R3U1aZcYLcfEjL/ABk13 VGVeKal9RkjY3uIfDuv/0tg6mJr1JLJEHyEGlb0dmRj+txCGOwht04trQ3+EmHhj0ljkTmiu579OY fO2OjM8haSX6rqEc7eQzDTRKV0wFa3Nyv3J8MQnQ2qUidM3Uw+bmGlp9xTkP6VVQ+EiXLg2kM3xaF bym4+RHzJVxHwKzgP//hEc7vSItW1PJqnsC4ZX6Zi0ZGUbKD6lGv60wvGlfhf2IoHvfgdt03NFvZZ FG2AH4SQX7Xy0is/zWsYUsThGh9E06vw6Fn2riLOAqFL5P/BrQIDatZEvAfgLOF6MisWwxLuvWjBK gbKorCoQ==; 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 1fl1tX-0006LW-Kr; Thu, 02 Aug 2018 00:55:11 +0000 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fl1sa-0004id-Bm for linux-arm-kernel@lists.infradead.org; Thu, 02 Aug 2018 00:54:17 +0000 Received: by mail-qt0-x244.google.com with SMTP id y5-v6so496464qti.12 for ; Wed, 01 Aug 2018 17:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HOqtMPkRrllAA9/+1/Qd/9RyHYWH1PW90do0Y7O7k3s=; b=J48J08jBgOnEIbwT8l0S0/82Ii1879zCV/9p5UpdQFlc43+A3FWHywZ9wQoyWKZPfA RKn+abxX/Jz1nJpUcCt4ckHqBTeXKx3DOu4CoOsVKC96PZJYHG2lmaaa3aR3VEiwQVKh xoa4hjSLtTrfau0si20EQZmyJF5r+HNoT9h+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HOqtMPkRrllAA9/+1/Qd/9RyHYWH1PW90do0Y7O7k3s=; b=iJlI3eCn4+9chBgBpf+6m1yUnCcPMIsyL7CQ2vRYl+YJ2vf0UiGyjsc1Pr96XVWlnv tVCIQx5czmXZqIyO6wV8n5dZqt4ArnfgVUYGNR4BBT9zPUFvkGuHVknDMxpH0yzPxltj mhtNh32qhmN563VeM/lD4GqMdHVYc/vv9GIALBzg/BFms4zq90d3X4/rHX6hijyJ6qBr 0+cBC/1qTr50LNfJ2SXwBMG6/K/CWcdC1/G4NH1MI0hCwc2WrLpDPRv0l6dQ0KRLufPG IySFTlK+DdCN7k8K1b/5VdyBSx+uG07N7QvZMjP2lMj0nOhQpSKazU9NHMDOJbsYDDLz 1YuQ== X-Gm-Message-State: AOUpUlG/HZV/a08BmZqNi1WZMblanTleE+9IOz+0vSOXbhlkVkcHKW/i dbjBKLQ8d3ZGES3O3b73AuUFvA== X-Google-Smtp-Source: AAOMgpd3V7XjdMbu7A+lB59HapT77cCdi4ISeBtIH9hK9rurnSlrysgteY308G4SOwHYL7NWB7KHPw== X-Received: by 2002:ac8:16ee:: with SMTP id y43-v6mr658592qtk.148.1533171244590; Wed, 01 Aug 2018 17:54:04 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e81-v6sm325116qka.3.2018.08.01.17.54.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 17:54:04 -0700 (PDT) From: Arun Parameswaran To: "David S. Miller" , Florian Fainelli , Andrew Lunn , Rob Herring , Mark Rutland , Ray Jui , Scott Branden , Catalin Marinas , Will Deacon Subject: [PATCH v4 8/8] net: phy: Add pm support to Broadcom iProc mdio mux driver Date: Wed, 1 Aug 2018 17:53:53 -0700 Message-Id: <1533171233-14557-9-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533171233-14557-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_175413_005849_B631FE25 X-CRM114-Status: GOOD ( 14.15 ) 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: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, 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 Add support for suspend and resume to the Broadcom iProc mdio mux driver. Signed-off-by: Arun Parameswaran Reviewed-by: Florian Fainelli --- drivers/net/phy/mdio-mux-bcm-iproc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index c608e3c4..518f4c7 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -286,6 +286,32 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int mdio_mux_iproc_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iproc_mdiomux_desc *md = platform_get_drvdata(pdev); + + clk_disable_unprepare(md->core_clk); + + return 0; +} + +static int mdio_mux_iproc_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iproc_mdiomux_desc *md = platform_get_drvdata(pdev); + + clk_prepare_enable(md->core_clk); + mdio_mux_iproc_config(md); + + return 0; +} +#endif + +static SIMPLE_DEV_PM_OPS(mdio_mux_iproc_pm_ops, + mdio_mux_iproc_suspend, mdio_mux_iproc_resume); + static const struct of_device_id mdio_mux_iproc_match[] = { { .compatible = "brcm,mdio-mux-iproc", @@ -298,6 +324,7 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev) .driver = { .name = "mdio-mux-iproc", .of_match_table = mdio_mux_iproc_match, + .pm = &mdio_mux_iproc_pm_ops, }, .probe = mdio_mux_iproc_probe, .remove = mdio_mux_iproc_remove,