From patchwork Thu Jul 26 18:36:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10546299 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 6C7B3112B for ; Thu, 26 Jul 2018 18:37:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EFCA286F2 for ; Thu, 26 Jul 2018 18:37:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51FDA29A42; Thu, 26 Jul 2018 18:37:02 +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 C194D286F2 for ; Thu, 26 Jul 2018 18:37:01 +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=JlwkfO2bB/vTanULAWo3cMyPzTNokZyPYoDgRjSQzbI=; b=TxYnIQ+pwuU5eCckyaL2q7hpG2 EQQngyGDYeyeCDrjKD8auHw9v+wqSh43xTX3yfek5yPAeLMEv4ya6wRq4QQE77JysbYoAE6usFtiK W/yipLqQ5IQRTQ2UVyD5Z6gT0DacxJvvBQMYUtQbcCzeGoxsYEOLFqOrPukR9SGKs/966cfdvOVJR 1jvSjSP4QqrE9PnGrXzYwaICSkHkAcVDh38cks5SqHDneNKbBDlBqcX/HHph9tAGQmTljMLDuyfdN QCqVjadN5ksm50wlD7Kg9EAZefmKE3KFgW0n9GBI8SPrY2ilco3Qt/iXjyyrcQkwjoesZK/LVu9KH l6mHDC/g==; 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 1fil8B-00019q-IT; Thu, 26 Jul 2018 18:36:55 +0000 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fil7s-0000oH-Sl for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 18:36:38 +0000 Received: by mail-qk0-x242.google.com with SMTP id d22-v6so1654177qkc.8 for ; Thu, 26 Jul 2018 11:36:26 -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=WFmqJHdp6mCHYyzAsrWYd2ctjn5+GtF9fEC+CYHgUWI=; b=Bo3xfgCi9h1TG52DoF7q7jRfsoqb3z8Ufa7CTitDKBC9StxecXLiWVAgYjN1neP4ZZ WRIQIh58TbutV52w17vOK8x6T7Ch4dhXf5vSsSw/nbgDUKaMpX0lOdE0He8x3WWOFiZu 8DZ5fwgllGs4RoFf5SaXFuUcYZ5rtpbrdKJnA= 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=WFmqJHdp6mCHYyzAsrWYd2ctjn5+GtF9fEC+CYHgUWI=; b=Z+6xFnw3iKNn4MzKt5PezSsPXxmfwOQ1nO5wDMChyMO8JQHtuSP4+oziv/CnqYbE4E WHam0yy/2HqlrukeHgAuOLOP54fOey4Qtb7mBANrKUeh1zaC8bu0Ljj+5uijOgWbzPP+ TNT6wFOp4h+IqyG70Ebo8+a3EC+otphZ2Zv4A3FhlSKfEc99n+QAYFL0lfaNoceiaUto J9SqoUZaWJ1FL6ob6VYjmWqSBZepdBkBo9vPZuWnDnxwXXd6AshaFR5rbmu8nMnv+3lH Gc/3kuxzqXD11G+DJDGO1A6+A6vWfC0ExE/OwEYczjmnZdOkKvSi++8wLy9We5xdBEuh 4TVQ== X-Gm-Message-State: AOUpUlGPj7dl27WPQVfMRvHavm/pDCjm9tob4VUCcZ+4Rc6ffElbz0Fz lp9JtbiKqFiFIw+DyBbRCaq+Xg== X-Google-Smtp-Source: AAOMgpcXEoOz6oBvk/bfH1PNIZB0bT+AWkOaMPlaQNP1111lu+xHmAqIzFwH3v5hGSe/ptMSrFmNYQ== X-Received: by 2002:a37:9844:: with SMTP id a65-v6mr2905728qke.30.1532630185751; Thu, 26 Jul 2018 11:36:25 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:36:25 -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 1/7] dt-bindings: net: Fix Broadcom iProc mdio mux driver base address Date: Thu, 26 Jul 2018 11:36:18 -0700 Message-Id: <1532630184-29450-2-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_113636_928302_E4581ADD X-CRM114-Status: GOOD ( 15.79 ) 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 passed to the Broadcom iProc MDIO mux driver to point to the start of the block's register address space. Fixes: ce8d5dbfd64f ("Add DT binding doc for Broadcom MDIO bus multiplexer") Signed-off-by: Arun Parameswaran --- 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 Jul 26 18:36:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10546301 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 7684A14BC for ; Thu, 26 Jul 2018 18:37:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6801A2898E for ; Thu, 26 Jul 2018 18:37:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C24829A42; Thu, 26 Jul 2018 18:37:10 +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 111FB2898E for ; Thu, 26 Jul 2018 18:37:10 +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=6FJfFk/DEj5QOdgTUe1rsYg4xxsx5MQbYGTl1VFoHBA=; b=BRpd/4iGe3T93Z6DdDR/mdHItU AUBqBFvL35097hz+EBRwlT8UG1OJuZENaKs6VqmoyI21txuTRONLMOef+FR0aVv7/pYvxkhxvrIpu trnO3Yg7tZx6X9PUFRpuvLOmYL2VobooWryvOUjMlcCFLCJ70UC5dAx3Y9qjKZOEEezdm7q+S1IJa RKpui7gBZpF0aaEhdLl0tGpVHGkk0foMR9twcKitdIN9331R50fCPZCg9BqoAcC03x9MNpKG1hsJc 7NFUUgzPA+3ZAKy6hN7FziJUn7Zy9IanZIwnCMwBnNx29t6KTKeK8sqJPtHtiV3ZnKu+klEAP3imD 0W1D6nLg==; 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 1fil8L-0001R0-Is; Thu, 26 Jul 2018 18:37:05 +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 1fil7v-0000oO-Qh for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 18:36:43 +0000 Received: by mail-qt0-x241.google.com with SMTP id a5-v6so2581734qtp.2 for ; Thu, 26 Jul 2018 11:36:29 -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=qhMmO3t4z8ApHkpA1UI4UHn9wqbdJDZKJChQ0iIzYhg=; b=b+mTB1+Id4OXIMjtmmUo17TKsBC2RBtwe9HD+nkGGBoOdfLtMG6WsqPh3GW4+dq4Lu eBBr1HRVaR49WZYoeu9oKeTGwgZ3PPPVAfSKdmNjAGWMDjZOo0dTuUKi0KLeFO0pcE3H lEXjSZgDbiaNg19Ot6nrNhcIfrj1uL6ChOv6M= 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=qhMmO3t4z8ApHkpA1UI4UHn9wqbdJDZKJChQ0iIzYhg=; b=C8uOj0kxewewZDiuYXn0UQ3LJdMVcpw1h6KWaZ4aQ9pFEPfJMGKjIobSCbsQtqrl+R 03Dkl8HhKegML7t+6YlyF6BCObMh0EXUHsbC9lK7VnUJ9YkSMxlWaXHs16pZA5VNDXOO 0Yr3I7b4SxPKIxs4x1741VPdJjbBpU0JzRJATowvq+hTuRE8K4W8/ijGZj/+g3W3r88W XbnE36a53NoeH5XZJcJYBoS8P9y+4faKNt95AcFFk//N+YIvV5OtOPhWa/CJT/ZsTjwa G95nDQ2ka7c5v2sFKz9aqOXFTR9TFZ9YLgFbepOiEcrHa65ckfPKqcKAuGkfk531wh1s 68eQ== X-Gm-Message-State: AOUpUlHrJORtWtGZhTl8KfjIefRgP3kZtYRSOz1EIxot2bjqh/8O2+LI 2iONljqxYM/BPZfREpci1m1xtQ== X-Google-Smtp-Source: AAOMgpfLrc9XDZPDp9DKjov4e+e0M45XKV1xMv9ZdN+pWcU6zvOpg5dzXuwvPCmXm6jSlIY7ILypYA== X-Received: by 2002:aed:2207:: with SMTP id n7-v6mr3046886qtc.302.1532630188715; Thu, 26 Jul 2018 11:36:28 -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.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:36:28 -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 2/7] net: phy: Fix the register offsets in Broadcom iProc mdio mux driver Date: Thu, 26 Jul 2018 11:36:19 -0700 Message-Id: <1532630184-29450-3-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_113640_316796_EF6A241F X-CRM114-Status: GOOD ( 16.29 ) 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 specified was from the middle 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. Fixes: 98bc865a1ec8 ("net: mdio-mux: Add MDIO mux driver for iProc SoCs") Signed-off-by: Arun Parameswaran --- drivers/net/phy/mdio-mux-bcm-iproc.c | 10 +++++----- 1 file changed, 5 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..dc65e95 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,15 +30,15 @@ #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 From patchwork Thu Jul 26 18:36:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10546303 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 25AA914BC for ; Thu, 26 Jul 2018 18:37:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17F3B28D0A for ; Thu, 26 Jul 2018 18:37:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C0C12BC03; Thu, 26 Jul 2018 18:37:22 +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 B143D28D0A for ; Thu, 26 Jul 2018 18:37:21 +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+E05gNbeZR6Wyr2QSIM2IEEuNYJ5F9S2kes7Pn+diU=; b=j3dRxKdAMngAeRTnN3IIkwAfKL Tb16EgChifm5RFszAdDMlRArTK3UDc/8yTs7d/x07w07TYLYJ0wcduA78RlKiN4bPFin6G0BTqzu0 qaWz3aXEm52A06dK6LspDOd20uLSW+YbPcz74JRj2FANlyqt1XuWzFaI3h/k2oJGlrax4hnOInXAH VVRykAe5oKCgFUUrHcBHJ4XvAWHcw9RbDf9hJknHDi0WxTAEPGm1MCTZTjWrstK36Nz/4gpj5auFz /VSDazYDWHt1bI4kF/yeQ9ZM/fkGqziDbt7/x5LOKMh4sC267LYoQrfIzBPlDVm9NbZ6YFmfaQ9mq fHSojyOw==; 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 1fil8Y-0001hr-5O; Thu, 26 Jul 2018 18:37:18 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fil7y-0000oS-RO for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 18:36:47 +0000 Received: by mail-qt0-x243.google.com with SMTP id n6-v6so2585801qtl.4 for ; Thu, 26 Jul 2018 11:36:32 -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=MCYxXF4NPzvvJ1VwO4jyNg04RUZXhkap/acOlejT33c=; b=JgT/xUME3xO42BFQz2K8Am8yycUyzd+48lbfZSGNW2PjLs9u4gbcr/iRhAYyjszn9/ 2ArPY0BjX9flYzuYMC5APIleHYzkmtywXhecVLbVg6tCAyWx6osA1QSxy+a00nd7y/Jp qmjTAmRWQIUSR36P6uohLBdIcJt7/iT9FSOvI= 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=MCYxXF4NPzvvJ1VwO4jyNg04RUZXhkap/acOlejT33c=; b=iAATrZiMeyBdzr6W24BFbSvKVPVqLXpEAirZ5cpW6j1vVhvGokVb4fVIgpE6JarwCq qWwvmP3TBQLZGljtsnFkiTv1R4gtCXioNl1eNZKLqjn0+X7m1992rhBJgoT2AMX+8UVF /hczae8GIJFwtyU8KuWoNakmNNr9bECpoZ7k8sMgBhFgQTYdDPK9m0BDvrXEK1A7jh1P hhPQgJMnLfGGvyyXftp9FtoaoN6DmlNU9Dck9xA8gKLqRVEv74N156PmezJUMjRKA5aP K/HeX5VrrBDWYDWM8I6A0M25YDyoofNamvA4DbOymVL/QtZPHnamta4i5mTCiijxbIdG s+zw== X-Gm-Message-State: AOUpUlEVZT5Od6rYdEiwmMh9za7vn0sSgkUeK4gZoOrTtIki9RQDvNlQ c/uaECfORYy6FssptlN4OkuJAg== X-Google-Smtp-Source: AAOMgpdFz3sdjLWzA8ve/Ef/75ELsLb2t9u1PFc9a3nuaJuUNyItKJnPVdYpPD8XImQyEQlqkqMXvw== X-Received: by 2002:ac8:3864:: with SMTP id r33-v6mr2976527qtb.24.1532630191718; Thu, 26 Jul 2018 11:36:31 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:36:31 -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 3/7] arm64: dts: Fix the base address of the Broadcom iProc mdio mux Date: Thu, 26 Jul 2018 11:36:20 -0700 Message-Id: <1532630184-29450-4-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_113643_556880_2F83A7CE X-CRM114-Status: GOOD ( 16.63 ) 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. Fixes: fd898f75dac7 ("arm64: dts: Add MDIO multiplexer DT node for Stingray") Signed-off-by: Arun Parameswaran --- 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 Jul 26 18:36:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10546305 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 581F0112B for ; Thu, 26 Jul 2018 18:37:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AFED2898E for ; Thu, 26 Jul 2018 18:37:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D9E62B538; Thu, 26 Jul 2018 18:37:37 +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 E75EA2898E for ; Thu, 26 Jul 2018 18:37:36 +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=9aiax8d7OCPPVKdJ4FZOyHdWPrxHtkKw2LlQbb/Suaw=; b=o3nUN23S7EssFaLQLHau89RRrs T0OjZIS1DjwqHdR0KhorClwIR782Hph29tztqddrz8A8MmXZsxQd6DY5W2zQ6x2lNZODShUN/eI3w /4vj1VlsJo4F97hpKFzbQUrNwr5POhBcL+ohUzyE0nWYR7Qzc4wy/RfzQvQFcaNcv3sKqjx03kdEF naE8F1qYp53HXWXuyFgtxxdhWXXmRPdu04LjxiD0UcqjGlF1IURpkg2uwzyT943N0TJ5nNgrn5dQi Z2TfNENlK4AhK3smWGqAr6WwiceR9fOX6gYpxidGJjXKKeyMZQFZyxQreQLJvXphdVAjBIP/qoH83 vwEMqMPg==; 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 1fil8k-0001wY-FR; Thu, 26 Jul 2018 18:37:30 +0000 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fil81-0000pq-HN for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 18:36:48 +0000 Received: by mail-qk0-x241.google.com with SMTP id 126-v6so1666258qke.5 for ; Thu, 26 Jul 2018 11:36:35 -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=W3Em1zX1UPcM8idrOCNovuYTIKSfFnMtYYlJD0Sc40M=; b=T1eGqFo90VIEyRzmotmz/McBV88Chcivpp+uEoCOFgze3+yrSDwlL8aDQ2SAHDqG7B R6qEEDYG1eoD9VJdctvetP7Pg5jzXshYI//Vo0+8FYjkbeMAsh1MFVI8NhDQCHvdCXUh qQZF6OguNbPBh8NLhtb0NG4X8mXGcMdYC+GXw= 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=W3Em1zX1UPcM8idrOCNovuYTIKSfFnMtYYlJD0Sc40M=; b=HLgoPLOzXf8rHbvEmIop+nuKQ2kG4ddRUecC1Yqew6pzBtomc192VNqx41cWJ4SInB sPTJwgYia7qnJ1zwJFKF7RepIN9YZGrKoz+aDh5X3JBlhj1X6jVvfDzy/oBEgWr/BatM cpg2psLRibmnWKMH6C+unnLl0a/SNbmhysPEHHA7dKBIAreZLlUf5Ar08bBODRBZXubX OgKpYTgxZzONxwq0wGnyisSpqHsZHF0Z/pFL35hkGthMLPSeHRFxD1+HBO0jNpFvMSut C63gQ405mpO80WA+TITtUcrAgedsMUai1xRi++YzfZYY2fenrFDEBOHJ4XT1cdVgqfMK Py8g== X-Gm-Message-State: AOUpUlFluwZBy7VgWaK1KzTsBQFVXFPkB4F2EG5QwuMXsPaZskYoXreg zaqIcTmUAboCbbO1nT6eMhXt+A== X-Google-Smtp-Source: AAOMgpcHYN2kmLR5S4j/mBWs3cT8ILvYhOBPdlwgiZUJpwagkGCTr/XdnpAcE3spMZVQADcMVq55lQ== X-Received: by 2002:a37:88c5:: with SMTP id k188-v6mr2994156qkd.365.1532630194741; Thu, 26 Jul 2018 11:36:34 -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.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:36:34 -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 4/7] dt-bindings: net: Add clock handle to Broadcom iProc mdio mux Date: Thu, 26 Jul 2018 11:36:21 -0700 Message-Id: <1532630184-29450-5-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_113646_113020_267D841A X-CRM114-Status: GOOD ( 14.53 ) 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 block. 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 --- 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 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; From patchwork Thu Jul 26 18:36:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10546307 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 EC6A514BC for ; Thu, 26 Jul 2018 18:37:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEF4F2BBFF for ; Thu, 26 Jul 2018 18:37:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D071D2BC02; Thu, 26 Jul 2018 18:37:54 +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 801D72BBFF for ; Thu, 26 Jul 2018 18:37:54 +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=fiOp8n75ejrbw2C4WYBGRfoBw13U6HhLlyOqLk9VFUs=; b=gFFu8/mn5fyTfCsT94Td1tPEiV wzUneLgJL2JWETxo2FA9vRuYltqVifpeCe4uAi4oc4EnSoyBadtrEC4ICj9PPH82O2dZ3Gp1q4Jw9 Qn/I4nCjaz0cuNgUMT5nsk3rpTakTD5DCnoZUqo8JkdFl/0Ao2BladqnBb+/3Tub1ugw70eFon2e1 pTlZg0DORfdoNc8Ctk8oSIEvALT1oxnhO6CetkVx53CbnlauOjir5odowYLmVqFKM3v9E2uwRWtz5 I5HTHx24FP/JKZFv6PUEbzms3FH5y5Fw2cRFcetDaLLJWtPrKUYsC/5LClJMHa48JtIW6z51WuGF5 axdrxTkg==; 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 1fil93-0002Ka-EP; Thu, 26 Jul 2018 18:37:49 +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 1fil87-0000uC-VW for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 18:36:53 +0000 Received: by mail-qt0-x244.google.com with SMTP id e19-v6so2572977qtp.8 for ; Thu, 26 Jul 2018 11:36: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=U06FaEejxyxvjAYaxOat2qv5fl7gaHh65Nf8HRFkW30=; b=iKW1K+zFeuKqGM3QvPsDT28zCqN+1KJCTfmkloSeyTV98rdaEczFQrO+5w92nftoOH 8YjpOYcg9GsfLVwbQLv1FaV8rcQjrNv8jgm5Ybk8a6yQCSeS0jbAFxOHlPxMiqA8w3Qo YCKPlCnUW2Lyu7OuMiGg5T/0J8wnxbSmkUoVQ= 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=U06FaEejxyxvjAYaxOat2qv5fl7gaHh65Nf8HRFkW30=; b=fckPng/9XddMkXUHHEKzC2Z4OFSkZ6saDlGW40LSGCxaUEgFGObcOy2qkRD+e4jsAO qC5NYML965X08kTk2RUMgDzHnTvUUVF4gGdqNTRRz8jiZcROyLRw3rhyJAv5LrLqxUZ0 AYeSsnB4VJpCkJEs0d3bwZxTHv2Y+SMmGZuceKfLgE0GTiT516tILk16FjRLiqgFYdLt PWsWTYC7jZBGVRolKki5Xy/ZU6yKjGf0+hRwF1RAKTbl3uqBJc/XsKG2ct9shb83cd9Y we2Kt57WNxTjCYXA5IAy8SdPrvvGaJaZOOY20fIaP98obC75PEaXBUdqi8byJfYRB9Vb UXIQ== X-Gm-Message-State: AOUpUlFYTUG3Us9twYKO0qXpBjzhR2Hf1Zdwtaeoe2s7txgJrZUqMNbv pHl3UaLIYFVJVxwmBJw9K+EC0A== X-Google-Smtp-Source: AAOMgpcHy5ED9ay2VhEUp4xZ8PGdvBS6bC6RmPb5qWrtzTuBDgM+pRtFgf9yyTj1NCKJixohwNUeQQ== X-Received: by 2002:a0c:8441:: with SMTP id l59-v6mr2785673qva.5.1532630200886; Thu, 26 Jul 2018 11:36:40 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:36: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 6/7] net: phy: Add pm support to Broadcom iProc mdio mux driver Date: Thu, 26 Jul 2018 11:36:23 -0700 Message-Id: <1532630184-29450-7-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_113652_165159_1BFB065E X-CRM114-Status: GOOD ( 16.03 ) 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 --- drivers/net/phy/mdio-mux-bcm-iproc.c | 42 ++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index 6b400dd..89c18d6 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -51,13 +51,25 @@ #define MDIO_OPERATING_FREQUENCY 11000000 #define MDIO_RATE_ADJ_DIVIDENT 1 +#define MDIO_NUM_OF_REGS_TO_RESTORE 2 + struct iproc_mdiomux_desc { void *mux_handle; void __iomem *base; struct device *dev; struct mii_bus *mii_bus; struct clk *core_clk; +#ifdef CONFIG_PM_SLEEP + u32 restore_regs[MDIO_NUM_OF_REGS_TO_RESTORE]; +#endif +}; + +#ifdef CONFIG_PM_SLEEP +static const u16 restore_reg_offsets[MDIO_NUM_OF_REGS_TO_RESTORE] = { + MDIO_RATE_ADJ_EXT_OFFSET, + MDIO_RATE_ADJ_INT_OFFSET, }; +#endif static void mdio_mux_iproc_config_clk(struct iproc_mdiomux_desc *md) { @@ -258,6 +270,35 @@ 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) +{ + int i; + struct iproc_mdiomux_desc *md = dev_get_drvdata(dev); + + for (i = 0; i < MDIO_NUM_OF_REGS_TO_RESTORE; i++) + md->restore_regs[i] = readl(md->base + + restore_reg_offsets[i]); + + return 0; +} + +static int mdio_mux_iproc_resume(struct device *dev) +{ + int i; + struct iproc_mdiomux_desc *md = dev_get_drvdata(dev); + + for (i = 0; i < MDIO_NUM_OF_REGS_TO_RESTORE; i++) + writel(md->restore_regs[i], + md->base + restore_reg_offsets[i]); + + 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", @@ -270,6 +311,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, From patchwork Thu Jul 26 18:36:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10546309 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 653CD112B for ; Thu, 26 Jul 2018 18:38:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 574132BC1C for ; Thu, 26 Jul 2018 18:38:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B0202BC20; Thu, 26 Jul 2018 18:38:57 +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 EB7A72BC1C for ; Thu, 26 Jul 2018 18:38:56 +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=3RgwLYCfek8IjNRybHnEkvTGqbLYQtkL64sN4pRXfaY=; b=KUAzbLBMVF3x3OmuEHhazD3+KG nzAUzb0YsQuThqjTfCStQf4KJU44Uwj7UMr6ctRP/d+jYw25Dcn6OgozaMLG9emNHwBQX3SZsfvIe JeHUUDG8TRsHEhaPnyj/5zZXdgVibe9VuRfSHY51TpYMNHuPQa3D8AHhS1/kazny1WaV7I6Q9FYLO 63Ssz7mKi5djuOr7wlz3N+2EYzv3emiuVd906havHZoBFBn5XBQa+w7ffqhrQSI8WhXurLd4d6+xZ cH9uQRE4spmln7amvsLOSUS5rVW5hrVvr9WGvWl/eKroSR7ShhU5jp/BcjFh3zQOi3e5nVHws4yow nL9H06lg==; 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 1filA2-0002pW-7U; Thu, 26 Jul 2018 18:38:50 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fil8A-0000yc-Ks for linux-arm-kernel@lists.infradead.org; Thu, 26 Jul 2018 18:36:55 +0000 Received: by mail-qt0-x243.google.com with SMTP id e19-v6so2573117qtp.8 for ; Thu, 26 Jul 2018 11:36:44 -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=/bNfDVbfghH/SNSX4UM/6ceNHRpa1rw0i7lqzYlIwC8=; b=JSNc0EXFznEfm2AiH26/Z9W4Y54BJpBRPj8a+3RBw0Db/q5GwkqAIF0zHUXuiwH3Js dsWWxCQm1Jun6SZ9qB3iamDNKlDPQNa8fDhJci9i3s039RjKy8Ai6qhdZAwTo6kZR9ho Xtx+g7uGLoDceDpmRwA9RKLz04M24CNcfXdRY= 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=/bNfDVbfghH/SNSX4UM/6ceNHRpa1rw0i7lqzYlIwC8=; b=Nj2wisNwD2BQp1NKynoIhWSUMyLzq7yMsoXKdc/6/qsAWTNC2p0Ff34kTbQSck2E8m KpME+aNhBZBI5gB4GLDyoZm56UZpVzKd4Djyc4VmbE/1V9ANl1TmtY7slsglCIj/aWZt rdQ+6czbOjxb9LUoYEAkx/W+UwqHeG5Xzk715zXxKDM2IInPml4SMXTfi0NgX4Lz1vRJ kVv7Dz8NGtKErhUELXoGh3SY1XE3oadFwHwMPmZr2o4etRiNecDSRigWxMCsROyAj0hb 5wUpcY8uqMiM24+1tkr6MuFM1NCnDW69p0AnYpfsqV2+Kf7yJ5IPKm3Sgi2/q79J+H38 UXtA== X-Gm-Message-State: AOUpUlErr/earTURJsSeFhuXTeeZxECv+zfX7f9FoCx2inii0KUW4vhv f9fC1S6LctGm/JDnngqiBYrVlw== X-Google-Smtp-Source: AAOMgpf8l8rBjYFt+tJtt3sLcjyi6g9Nu36a4MopheVrS861ocn/SdXJ1SFtRnjT3GtCxKL9BALrmQ== X-Received: by 2002:ac8:41d6:: with SMTP id o22-v6mr3153684qtm.1.1532630203847; Thu, 26 Jul 2018 11:36:43 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:36: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 7/7] net: phy: Add pm support for scan ctrl register to bcm mdio mux Date: Thu, 26 Jul 2018 11:36:24 -0700 Message-Id: <1532630184-29450-8-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_113654_700562_834D7D51 X-CRM114-Status: GOOD ( 16.01 ) 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 saving and restoring the 'scan control' register in the Broadcom iProc mdio mux driver. Signed-off-by: Arun Parameswaran --- drivers/net/phy/mdio-mux-bcm-iproc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index 89c18d6..d1fce1e 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -26,6 +26,9 @@ #define MDIO_RATE_ADJ_INT_OFFSET 0x004 #define MDIO_RATE_ADJ_DIVIDENT_SHIFT 16 +#define MDIO_SCAN_CTRL_OFFSET 0x008 +#define MDIO_SCAN_CTRL_OVERRIDE_EXT_MSTR 28 + #define MDIO_PARAM_OFFSET 0x23c #define MDIO_PARAM_MIIM_CYCLE 29 #define MDIO_PARAM_INTERNAL_SEL 25 @@ -51,7 +54,7 @@ #define MDIO_OPERATING_FREQUENCY 11000000 #define MDIO_RATE_ADJ_DIVIDENT 1 -#define MDIO_NUM_OF_REGS_TO_RESTORE 2 +#define MDIO_NUM_OF_REGS_TO_RESTORE 3 struct iproc_mdiomux_desc { void *mux_handle; @@ -68,6 +71,7 @@ struct iproc_mdiomux_desc { static const u16 restore_reg_offsets[MDIO_NUM_OF_REGS_TO_RESTORE] = { MDIO_RATE_ADJ_EXT_OFFSET, MDIO_RATE_ADJ_INT_OFFSET, + MDIO_SCAN_CTRL_OVERRIDE_EXT_MSTR, }; #endif