From patchwork Fri Jul 27 21:23:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10547753 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 1C5A3139A for ; Fri, 27 Jul 2018 21:25:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AFEF2C541 for ; Fri, 27 Jul 2018 21:25:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2FA12C662; Fri, 27 Jul 2018 21:25: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 8CCD02C541 for ; Fri, 27 Jul 2018 21:25:29 +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=nUaOCqGclA+uJHrnrla20G3GEf72buRTMWENIOAVkcA=; b=gW2ALMcdhvRmuEKXmJD9ncZ9zD Nqfz/kAMw/5p+/6z26bMaS/DzECJ/ePyEbOfGi8MwT0+RMHpX9b3RP7+lZVHZaVmWl6PZeuYOxfLJ LHORWpCxU9wMyh5ehVcolPqy1MyDJ9Tl0qsm782aIyb/7PBmpHMi6I3tFLMMrOEowic36fd1U047H VATu+3eN7t/yeM1/OAa9OWNJO8FTJsiAweRm55zbbF2A17J/Z1bZZllA4u3l62kkUo+3fFe7JNEOu o+/QRthi2C+J93EdgR/zi4+PdKe8Csxhkrc8sIGmr/mfvki2l26nmKukmX/CUh6dG7n8GmyH7REQE a7RPHn/Q==; 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 1fjAEm-0000h4-Iy; Fri, 27 Jul 2018 21:25:24 +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 1fjADG-000715-RH for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2018 21:23:53 +0000 Received: by mail-qt0-x241.google.com with SMTP id m13-v6so6529306qth.1 for ; Fri, 27 Jul 2018 14:23:40 -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=HFsq6PnVJdmjM9IRM54aqQrw1tICaaWu3noJdqJOWCY=; b=dXYzPslOGt9xexHq7cxwNPVxT1Icd2yGWBNzoX4pWSCd3ClaLIFKQpuOjzhJ2ZvIL9 JUoe3LiQ5H5vcHcSN7y2L5YKSVptbq/3rwo+lgxcQdghX9MAeB4q/63R5JZhq9jHCbSV iCkBxRV0AQIn89VrcPYweLgZvyMK48OVVjEgo= 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=HFsq6PnVJdmjM9IRM54aqQrw1tICaaWu3noJdqJOWCY=; b=iyNvwLG5rKadnNEEAWAJ1Sj3V07jUjfepustgkY9gszv5BXf4g3qZJwKnmWyMurHks 2CuEtRbdJWmOVIM8M6/FVcuR5crosKY7qBQ2Sduk2+g226U4weigF5VNWZjpq8kP4rM/ TpTFvW582PG/K1XFQGdsRbTQzP0/RrzM09LvatNDD7di7cSlHESJ8Zxglh7tRnicIWjU Kx5tv9rXaM43fw7NPTIPtOfeqLTRyXnCSpuLLkJzwUetlRr+J1V5s5NwhQdCfBMTSFVh B6CzMUvYN0M1bDeYD/m5fvQ4m3fkW1cSWptwoFWNWUktbmqrSjNm3BedZdeN8NO/Mj7a iWXw== X-Gm-Message-State: AOUpUlHaAvoYPNggayQSZYuMiIK2Musl7F6uvULoUeP5pvRj7YRU7ANo 7Jfddx273/Ryfwz4VxzOU08glg== X-Google-Smtp-Source: AAOMgpcSaavhdQqZRZi+p5RZL81W7eqGV0x5b2c3qpEKfea4HyrjXj2NDZW41KlpPezP707QV4EZvw== X-Received: by 2002:ac8:1a5d:: with SMTP id q29-v6mr8082164qtk.132.1532726619466; Fri, 27 Jul 2018 14:23:39 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id e21-v6sm3416622qtc.67.2018.07.27.14.23.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jul 2018 14:23:39 -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 v2 6/7] net: phy: Add support to configure clock in Broadcom iProc mdio mux Date: Fri, 27 Jul 2018 14:23:32 -0700 Message-Id: <1532726613-6483-7-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1532726613-6483-1-git-send-email-arun.parameswaran@broadcom.com> References: <1532726613-6483-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180727_142350_965127_B8A790F4 X-CRM114-Status: GOOD ( 20.65 ) 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 --- drivers/net/phy/mdio-mux-bcm-iproc.c | 46 ++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index c36ce4b..51d1003 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 val; + u32 divisor; /* 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) @@ -198,10 +219,22 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) return PTR_ERR(md->base); } + md->core_clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(md->core_clk)) { + md->core_clk = NULL; + } else { + rc = clk_prepare_enable(md->core_clk); + if (rc) { + dev_err(&pdev->dev, "failed to enable core clk\n"); + return rc; + } + } + md->mii_bus = mdiobus_alloc(); if (!md->mii_bus) { dev_err(&pdev->dev, "mdiomux bus alloc failed\n"); - return -ENOMEM; + rc = -ENOMEM; + goto out; } bus = md->mii_bus; @@ -217,7 +250,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; + goto out_alloc; } platform_set_drvdata(pdev, md); @@ -236,8 +269,11 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) out_register: mdiobus_unregister(bus); -out: +out_alloc: mdiobus_free(bus); +out: + if (md->core_clk) + clk_disable_unprepare(md->core_clk); return rc; } @@ -248,6 +284,8 @@ 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); + if (md->core_clk) + clk_disable_unprepare(md->core_clk); return 0; }