From patchwork Thu Jul 26 18:36:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10546313 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 D041B174A for ; Thu, 26 Jul 2018 18:42:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C34332BCE8 for ; Thu, 26 Jul 2018 18:42:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C17462BCF1; Thu, 26 Jul 2018 18:42: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 5C7A72BCE8 for ; Thu, 26 Jul 2018 18:42: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=+R8tXcF8AksGiWv4bSGI44LGNRLDhiLl+a+yAeVTCgs=; b=EFQshUdwEYrqqhaKQFMy0TIGS2 kTFJSxABJH9sj6txeoqI9z7fvM91k8KUcTCkaEVz0zauxnbykp55Pfy1fuG0awuRh0AIROPL3p+NK GPGmaaA+qMjECcLRCpNkedv6KTZMmjaLPTdMRleSmLh9F4C/6Fz5EjQrjVnuS0Y7w+ysX2cjuG6wo u0dOWVzaRwl4wongVRUaj1YhSmsMusWiUiFeAC9wXSFDX06juEv4lkYYYXzYDlm2srJuSeIA32UFV 6/puo2bfAN/nZqCtoXTlvxVHUWa6lBgdamVtnt6O4uGMjc+jfIVFcwL+Joc3pifQumlZCRS82v0as 0dz2NNdA==; 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 1filD8-0007Jq-CQ; Thu, 26 Jul 2018 18:42:02 +0000 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fil85-0000qV-4X for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 18:36:51 +0000 Received: by mail-qt0-x242.google.com with SMTP id z8-v6so2574198qto.9 for ; Thu, 26 Jul 2018 11:36:38 -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=ikdg6TfgJbzPXN5/M/XZa8ZiI6+BvFzInZO5gyiw3Kw=; b=clNtaWq6HMGhWj/1UqXXdWVqA1vrQYtltDiUjk/fR+U4fxv9Lg7U7lDiRex/NWz/BB tf4ItbodXkp0DD3k4eobgmaOJMSxt5OBLqdzSNCGzdg+NWvfRu9x6HAkN3s5cOOZ5bFI jpPGd2jt3EpHwVzU1edbYqBeZkTCb/C96q8OI= 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=ikdg6TfgJbzPXN5/M/XZa8ZiI6+BvFzInZO5gyiw3Kw=; b=fH0ZTCxLYGdcb19GWlHrrK0sBIuN3Wmdxi6rxf7Q6B2Br9iz0yiou2ZvWWW8R0SO+l nieYfXYQW4NQlz41sYc1zaLTXZqfM7UYCE3HiIaU0UYsHnXrx5Si2ps9XCZM7H0maiUh NUEm1+DWyl5pzNd5RF674aGIyneJc+F3QlaUE9iSOUkXsBBeCJ4tVZbm0422M/23cK+g Lf2tXQc0ojHrqDQIgDnRC2oNtgoYautudw3sCwpj48Qab8Mk/7zlCiXDnF6BZCjp7WlE bmULSrW0FDWNdX8Ra4v+a5KkaJUMWRJsdRRih2Y+6Aai3KaeHtnlKptalb2NvygrlVYR hSCQ== X-Gm-Message-State: AOUpUlEotBNS0EHbq0zG8fWO5d/OCbGtzNouYRxSVOpQ9Z7pyfHn0Y0v XQ5nnK6e2BsNShwQg426Yg8O4Q== X-Google-Smtp-Source: AAOMgpdFJ2RDh9tPig5BouEq1S2HLkxPsFc3y0QdjSH5u75gFpe5/UJy3I4IaFflMnttreEs5+6bAQ== X-Received: by 2002:a0c:9308:: with SMTP id d8-v6mr2795146qvd.121.1532630197877; Thu, 26 Jul 2018 11:36:37 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id a187-v6sm1383359qkd.47.2018.07.26.11.36.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:36:37 -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 5/7] net: phy: Add support to configure clock in Broadcom iProc mdio mux Date: Thu, 26 Jul 2018 11:36:22 -0700 Message-Id: <1532630184-29450-6-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1532630184-29450-1-git-send-email-arun.parameswaran@broadcom.com> References: <1532630184-29450-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180726_113649_274340_0D0CC0E0 X-CRM114-Status: GOOD ( 20.16 ) 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 | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index dc65e95..6b400dd 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_PARAM_OFFSET 0x23c #define MDIO_PARAM_MIIM_CYCLE 29 #define MDIO_PARAM_INTERNAL_SEL 25 @@ -44,13 +48,32 @@ #define BUS_MAX_ADDR 32 #define EXT_BUS_START_ADDR 16 +#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_clk(struct iproc_mdiomux_desc *md) +{ + u32 val; + u32 divisor; + + if (md->core_clk) { + 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) { unsigned int timeout = 1000; /* loop for 1s */ @@ -175,6 +198,12 @@ 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)) { + dev_info(&pdev->dev, "core_clk not specified\n"); + md->core_clk = NULL; + } + md->mii_bus = mdiobus_alloc(); if (!md->mii_bus) { dev_err(&pdev->dev, "mdiomux bus alloc failed\n"); @@ -206,6 +235,8 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) goto out_register; } + mdio_mux_iproc_config_clk(md); + dev_info(md->dev, "iProc mdiomux registered\n"); return 0;