From patchwork Fri Jul 27 21:23:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10547761 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 E557C14E2 for ; Fri, 27 Jul 2018 21:40:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D41152C6F3 for ; Fri, 27 Jul 2018 21:40:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C787F2C6DD; Fri, 27 Jul 2018 21:40:59 +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 C2F232C6E6 for ; Fri, 27 Jul 2018 21:40:58 +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=CAXxG8y+nFrX1kOxThDL7rog0dq3aLV14xuVgRfl2XA=; b=oS6LzZimzTv6HZ0yeGRoxfTCoD oQWPuxz9wB+DScxRZhTxBPf9Ox4TQup+9j/FK9tLAhcGkYf6jnlRTpD+QKvERp/lZcvZ7MqlwK137 y1TZn3unKQGwXo1sUJXuPRf15FnTQun8kNBZjn3y8zSZzVEwUNUqIKbtk4JQYJ3dkpQA21/EcjbUk GaQ8V6MLT9duHQldLPjYuZRazFui490yRnPCNFRHXpfJyJYa5soEjY6SiUC+0CI/SlAuDdMlbpyTu 4Iqm6bT1MyZZ1zengKxKSPADnHVRG1nWG/tzxOpeDJmO3yLcm4v62GjQMaC6wDYOucEYplR0KuQok r9yUlBdQ==; 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 1fjATa-0007Ab-CX; Fri, 27 Jul 2018 21:40:42 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fjATY-00079M-NN for linux-arm-kernel@bombadil.infradead.org; Fri, 27 Jul 2018 21:40:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=y6Hd5BS/lfwDod/uAbVqEBcsSQeI1lqv/Zl6upf/sUA=; b=dhjCTohDlX3Ij8q30ftnTiPF1 0/Z5Q7oLvjIFFp9jNKH1w3wjAkDeDhRREW0H1rZDK8LxTnYSawpnrAoiHJ3FrtGqvXLRSGdJdsq/3 lhpAmZmm+rQOF79YHvX353MqqjkJOCwCb/8bKFMTlpK2tVqZuY4kTUJJo4fmOJKC87DkMcYDVN+GL AXuxLYG7jSJEHWpuGiIP66Z0V8GNnjAtc1b9ChLknU1OdM9m168bEPtdp589GKc2Napf7OeQcThOV pBwvBVmhEGbpRDfVe3Wka+8oSjDuF9XbZAwiJ3tRy/KPdpX6AR6UB5D7ErojqySN+p0shJPGxGTTK FRRqmB3Eg==; Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fjAE1-0002NC-Tb for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2018 21:24:41 +0000 Received: by mail-qt0-x241.google.com with SMTP id b15-v6so6513445qtp.11 for ; Fri, 27 Jul 2018 14:24: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=y6Hd5BS/lfwDod/uAbVqEBcsSQeI1lqv/Zl6upf/sUA=; b=K/AAJmlRAvJJHba+zF1e1iFmOk0ZaKDCUQu8cfqBYym7q/phu3yVpvpbpCHP9Vl160 lgrmUEGPc4HxykW2R63VfJ8j2WJQF0b+fbCUErEBNLkt0lBuBd5zST3lLSa7CuzyWdmG WpO+eUwGorxLumZ2feMR5R1zuuW5l02+i7xM8= 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=y6Hd5BS/lfwDod/uAbVqEBcsSQeI1lqv/Zl6upf/sUA=; b=M5zWCyDst+K6wFW2cigAlC80/pSNVomsCdHEM8SHx5Jun1idMvgCP2f7BDH1xQKKuX pKPTDeIKTLWGorlrOTNCtVEKDjw/499gQ+qi+SrLqN8c/ifhPWDGFNnWc0xHq0sSdAKF ghRx9XP0YZraUIbWlR7GC833mo7jXKlvCpaD0gA5wTgSkA0igs2Ts8UmCHZe5g3n7H+I A67qwpGYkPJIIPrAS2ZzV5Ebz3mf/G7XqbYjp6zX8kkb7riiMMPDF05gFhB33vu6kKhN GnpW1BrVv+iBoKWqVqv6s9JTQJhbtbePIHf7h908PqTbTPl7nOJoRpJOPteO1eGAP5D5 SwnA== X-Gm-Message-State: AOUpUlH/6FjrDykOsTxhucz2EAKMOIxpgBPlhF+vZLHYwzMfPmSGMjKG l7iUGf4p9Q21IgqKCpvfXmgp1g== X-Google-Smtp-Source: AAOMgpc2NZIdU2nC7sytihIATbiYlFlKPx8KqLjZKUhRpRonWHXSSaXEWac1qX9mk+MkeeJ4qIKFgw== X-Received: by 2002:ac8:7107:: with SMTP id z7-v6mr7417164qto.326.1532726604596; Fri, 27 Jul 2018 14:23:24 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jul 2018 14:23:24 -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 1/7] dt-bindings: net: Fix Broadcom iProc mdio mux driver base address Date: Fri, 27 Jul 2018 14:23:27 -0700 Message-Id: <1532726613-6483-2-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_222437_964071_C5DEEE46 X-CRM114-Status: GOOD ( 16.80 ) 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 Fri Jul 27 21:23:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10547745 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 92651139A for ; Fri, 27 Jul 2018 21:24:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 822FD2B3D9 for ; Fri, 27 Jul 2018 21:24:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75AFA2C659; Fri, 27 Jul 2018 21:24: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 1B5F42B3D9 for ; Fri, 27 Jul 2018 21:24: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=aLzCj1kU/hTh3NKxcjKB1mZfmgabZVLo4CH4iSRGhg4=; b=MdzTx7sAW8E4m0lGdWk+n/zy7h zCRY6VD9ZBh9sLY+/jWFoYCQL/E8/sEIbtpzzcAk5K7QzZLvtGSIMDpmPg6yySedgNgHZQZnqpZOv bLIeTJaCWX5/HImF3aL2+gQFUAHqPQwzK+l6qqkCp96Os1oSGgYPXsC7U4ArKxQoL8R9+lnYtae0A 3iKIyblTFr3VUJIHKRot9Ow7XEZXzTCv6zCuMPmpsmaHcnLw277Kuxd8yIzlKRNwHjAL/SY8G9v8t V/zi90LeZU6/fuvaJXsWVndu5RK2kqQ4hEKC0kX/IXHBnHySqlKA1DRHDuqn925ZNymQMWDLaRyXX g4FcoRVA==; 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 1fjADL-0007Hd-Aj; Fri, 27 Jul 2018 21:23:55 +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 1fjACz-0006vX-PI for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2018 21:23:37 +0000 Received: by mail-qt0-x242.google.com with SMTP id q12-v6so6511950qtp.6 for ; Fri, 27 Jul 2018 14:23:28 -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=glrFiC2JaRHiBpgqj/ziGAvHYME6SZdoFPAAkgy0RgQ=; b=eAMVYrEVayz/VBQ3w9slcxxuf0bquDmzmByVbJEay6ord4hkfaBA6eh7GUSkKjQVij l3UXPQ+xOLAfF6rZPKG+owzEFkUxVd8blxtDVgHjFReE5h46QTQ9W80oJYtvXtbrJ323 vTQCYC4uA4ej8LplirFIl4tNV/Ji6NGby/9Os= 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=glrFiC2JaRHiBpgqj/ziGAvHYME6SZdoFPAAkgy0RgQ=; b=DfN7TirMuqE3nqELLmlo1ZIwao2WOX7PvCqYrePYWAiKKsvc9rpJa6a3iSDtDYKP/s CIFEqg+xZFremDvD7sWIJMuCcM7e+JF8Xcw/qsJc7ZBEImYYy0c7GcTJU+1g1tBxDQ5k /0NI1XSps+CDFApNzcv4YqmuemIHnDuJxZZVdrAjpIG3s21COZNYrRbPtWKss0Lp4Qmh Ja2BALte25mgao7w8wgBmlSEqm1TAzrbNYnAuHwc4UnQz+83YON1hZ1HHuF+ElgsWUeq lSp9ofG+nq4XV2DltCISQLJiiERazPhMajSx4d5+NoqMjH383XntqmO4AVL1I2C/Y76I +EOQ== X-Gm-Message-State: AOUpUlH9E22HKOhlPZ7H4epRwh5tbD7RCTKD+ZrRuTWylBuS9H52ww9B TOwsy+HAWIqGaXHeci61UTwmOA== X-Google-Smtp-Source: AAOMgpfOhpmzDwiBOMviPPUDVF9H9HGWlc7Z6/x+9Pc+q/84OE1vu2PFxlyIzr0Wa/bL3UMOIlufbw== X-Received: by 2002:ac8:3692:: with SMTP id a18-v6mr8029803qtc.406.1532726607593; Fri, 27 Jul 2018 14:23:27 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jul 2018 14:23:27 -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 2/7] net: phy: Fix the register offsets in Broadcom iProc mdio mux driver Date: Fri, 27 Jul 2018 14:23:28 -0700 Message-Id: <1532726613-6483-3-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_142333_826861_88E25497 X-CRM114-Status: GOOD ( 18.04 ) 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 Fri Jul 27 21:23:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10547749 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 60200139A for ; Fri, 27 Jul 2018 21:24:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F2732B3D9 for ; Fri, 27 Jul 2018 21:24:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40EF42C659; Fri, 27 Jul 2018 21:24:28 +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 E06982B3D9 for ; Fri, 27 Jul 2018 21:24:27 +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=E207hlEMutKIoxFKSrDknj2rp03EDd07cY+331f8Ak0=; b=fbWRMbm4zCJPCQVXD+G9CEtHet luMy2s71hTXBC/YQPbzqi/kCFcDMzcP4SA9tOvMio38o5XE52k9nDR1nwSogelOM0ghyCdGC/tEQf MCueAG9NMBauIwcQJNScsJ78V/kR/rc9dWNtq+RSgYVG148i1GiaWP13yV6+Xxp+SePVjustYje76 B4sRt9tKJarBGIgbU5EnUdbPAuSA0dTfJhrWkRAaMLV8y0eetqXA8lEYi8DPg89CT1r4PXAAZiDNI FkjCKZfwSvgNzvUi6diF18Hpc+8xzYYJ0CrKIPGztswwTiPEvCR+P3U3P/S9OiJ5G+3lol3QCB62d AIcF4IKw==; 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 1fjADh-0007kA-FT; Fri, 27 Jul 2018 21:24:17 +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 1fjAD7-0006wA-SY for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2018 21:23:45 +0000 Received: by mail-qk0-x241.google.com with SMTP id c192-v6so4223352qkg.12 for ; Fri, 27 Jul 2018 14:23:31 -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=kDhDEieGfZgj7ft9srjOzP1iG7t2NYgyC6j1BwfZdrI=; b=fp09qhT5eUP4qmQhc0EZ2p6Pz+C/sLKm71MJJwNspesBpSElPmSHPljuh7vKe0kMIu HoZ8jhN1FTDESR8t2AhL2CAp8Y5dt37vIOetFXvq2nxjfpsCrtOT3MdfkHI0ExFuSnfx /srJVPQyzHCC1Bt6yxM/MLMl+WcmGkrUl3LsI= 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=kDhDEieGfZgj7ft9srjOzP1iG7t2NYgyC6j1BwfZdrI=; b=HJWYZ3gGlMeEvaXcPzoNPT0QpLqOrUVRQ8giyL4hDOtfHezVjNNqHu/zxSJ0i8FZY1 M9h5EhDOmeCYx5DTR64vD38zUSMDvQBk21k6vEP+Nw/9JgC29oAomlseC9kPMKIuOo4k Ko/OtgQ+RUsu/8H8CwBgOSB3noAcWPf6lbTMtz/GDTcYsa1dUMLvR4fqW8ILXg2q6BKO 5NNUd7GnJ3Kuiybzyra3yEss6+IDrX5G4EynJxOn3GAJn0OD+g9tzrww059+pIxdWpmy vSrke2QPjmgGeDvodFPWcdL/IXfOT/PvosOjFDYZsvxqHblML6Bpnobp0IA0+JYE5ZkD 23LA== X-Gm-Message-State: AOUpUlGV+ljQP4EytLJdkW4gF+t2wpgQqN+18ARFEl4P4A31L2/IqAqi z/NWSJtI2o1Nbfo6EbfNQjZWgA== X-Google-Smtp-Source: AAOMgpdcsLjbdWbYSRnnTsb9avwrc1L3znW7TqwUonf7M+87LXNTnAnsrVbFlzvxrFYCGdHPMHjHnA== X-Received: by 2002:a37:ab17:: with SMTP id u23-v6mr7423872qke.279.1532726610576; Fri, 27 Jul 2018 14:23:30 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jul 2018 14:23:30 -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 3/7] arm64: dts: Fix the base address of the Broadcom iProc mdio mux Date: Fri, 27 Jul 2018 14:23:29 -0700 Message-Id: <1532726613-6483-4-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_142342_140722_1DEE5973 X-CRM114-Status: GOOD ( 16.19 ) 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 Fri Jul 27 21:23:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10547747 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 D9E14139A for ; Fri, 27 Jul 2018 21:24:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C971D2C541 for ; Fri, 27 Jul 2018 21:24:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD05E2C65B; Fri, 27 Jul 2018 21:24:08 +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 55AF62C541 for ; Fri, 27 Jul 2018 21:24:08 +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=8+d3wHD7TC7O5jbuKhW7g+w3qL6bXk+QF1h4mD9AaqY=; b=lNA7/EHj9m4wowak/rWJPJjxLt kmi7Xds3TEjvCRGo8nssQlqQDZ27TQ+BB9Qg4RDgn9CcLsfMtTz+rT+SNSwwPnm52bRYDNyrRjgjQ 551e4qahGrniV9okWrlDNf4eLzyA/zRn5Ela6Wmr+zqrOz6MVu9MjCgjJ4ICkjmYxRkB41Rpya+l3 m2M8jpAfmI9LTxJrOXrWPBsB3O8/gvzdd3XXazT78e8pU/AAapLWbdA3gvwY7pKFtDyyUREMk7kg+ +h1Q6n3DfhloEexvjJKSN/qU03GRPyUieqj54XeLTfVT6v5G6pMOdz2HI+m2zFSm/6ph+rvHWH0c/ 6AktnHXQ==; 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 1fjADU-0007TX-H8; Fri, 27 Jul 2018 21:24:04 +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 1fjAD7-0006xH-SL for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2018 21:23:45 +0000 Received: by mail-qk0-x241.google.com with SMTP id 26-v6so4211629qks.9 for ; Fri, 27 Jul 2018 14:23:34 -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=fPy8zPe6vPwzlEfwZqSfCetRsqsUUmfFrykow6BYHEI=; b=gXoZFa7q++vuUQsgIhl7QzDxj6Ewj4MMz5xAvSRPv2XQ6HaDHcLtwM7z4CcKbavpR9 Ra8YRK8xVpDopM8ckq5nahnfUo9mE+Q9GI8UitiNOaa4UIlw/0y5LB/Q9+E8Iy5L6IZ6 rSNAvCrOkno/dYNCoXjvGeF6hYLsrNsA8i/YU= 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=fPy8zPe6vPwzlEfwZqSfCetRsqsUUmfFrykow6BYHEI=; b=I7YXIp1hFEoN4h4YURSDw/6QSomLbtP7qK2m66dD4BKrYNMm7GBH/3osuM3nDrNo9h 7bsmSWUj+KPIIONahpfTqqE0jrx1Bne7fCTuZWzh4wjPPZGqGFHzaOp9cOMt7ZEvbv4+ TpPWQQ+WAMDKzrvEaDwuHydLkd1Y1/XIawz6nv3CHAcwkkBzSG2eMVbfaD0s98yI7TtE xXuK9U3oZO+wOpGD0eu1joqrECC/3WC/B6Fz3PlicsbNb+84AL7RMZTwqxUTP/0fKj9d dfTtZB6ziEWd+KO9uTndazYBMjJIZouOa8pd546G9WRp3rZ0yj6oGoDinyqp27S5zEr+ tlRg== X-Gm-Message-State: AOUpUlEoRSxTARlgI97i25yyXkXVCH/KgZyEHXrqFOe79rBseYRKbzuX q6YwwY1ImrL65tKS9hYTIQXPrw== X-Google-Smtp-Source: AAOMgpdPNuvW+4TsmXgdUVB17D885pAr87/wUNRnv9KI7qKKcmanY6lMflUedfCrv7tLVyz89ZMUHA== X-Received: by 2002:a37:d401:: with SMTP id l1-v6mr7312531qki.221.1532726613522; Fri, 27 Jul 2018 14:23:33 -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.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jul 2018 14:23:33 -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 4/7] net: phy: Disable external master access in bcm mdio mux driver Date: Fri, 27 Jul 2018 14:23:30 -0700 Message-Id: <1532726613-6483-5-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_142342_136816_22A95952 X-CRM114-Status: GOOD ( 16.48 ) 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 Fri Jul 27 21:23:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10547751 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 2008414BC for ; Fri, 27 Jul 2018 21:24:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0ABDE2C541 for ; Fri, 27 Jul 2018 21:24:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F28502C65B; Fri, 27 Jul 2018 21:24:35 +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 9D3042C541 for ; Fri, 27 Jul 2018 21:24:35 +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=9yU9r6Q9o4L96JIpC8zJhmrs+LqNHutUoFH63YCBpjU=; b=IzEsgGDh5dTlxmqzZNEjkMEU6W 17k2wZCqkYkAAgjiTpXgyUMlWgFY7y1IaZZurlbnWSjPYOYCgCOYgE10WUKk88B/cEIG7qjdkI/PY KqmH23rP64G8QHXAQ6EjgwZFR3bGMtgDRVoNEo54yhlBwVe1R7oacZFl4xjkLU22KJYVg65or7m3i a4R0thHUbx+fcvH5bhCXk5iZwF0mI0H54p+2rzibODeE0o7KwMVCrs9d0DtGdGnprRXw5d8xWVkQa aYkDpBJOlju0lRLyKZJNxTmLtMbJshwmGSyFuhvJZh5jqRr9y3/GBkh4iz0DMHEliVaeY3QuXZplH MIQZOOzQ==; 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 1fjADt-000801-RY; Fri, 27 Jul 2018 21:24:29 +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 1fjADD-0006yW-Of for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2018 21:23:50 +0000 Received: by mail-qt0-x243.google.com with SMTP id h4-v6so6514137qtj.7 for ; Fri, 27 Jul 2018 14:23:37 -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=dYPpw6H1dyI06VHDUYPiZCD3atKutfh2hFmhSO5Fw3I=; b=XWPXhjpKSnr1JYfVCmgTBMn1mfrjpMZ85ncknhbR9bnPGIjL4NCU+2C+giFgkc2N+k Kemvz8wP0S4D4QlGcpPRe8+VdQ1ybZQDSv/3ff5B2WBP6EGpA5sAXvtrFmMz4YKcckVU /5VIhLZxRd2ssqmDHH/HrtZJgJl5uqgEmtrpk= 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=dYPpw6H1dyI06VHDUYPiZCD3atKutfh2hFmhSO5Fw3I=; b=o8mMH/yJRqa1mN4BfsbUyx286F/yfMgJt8QH68zNLPkvyRN+0OZ4SdKTkT26WEWAaJ W+ilzxyK8tYs0grmbQpayH+eo6U8Asru37POxbx+AUv64BjHxAGhr+JRvNTeHBj+ft0y cSTe61ZPZHoYofaPdudSuznHTllyXi4xJp2xeg3jn5di58EPFsXhH1L6A81ukPspOBf4 xaOyzKaHfFIlKFuAd1A6IV37dmh6+MyJBL+B9tCs3L7oNSM3SszKBvlHKoZ/28G59+zo VG/ptwtFVul7eCYQ6/pYLSFyBe2gZvfrBLpOfMIRa+bUmFrvP9qsrudDncsZqSInfmTB Ezdg== X-Gm-Message-State: AOUpUlF6Eb5dBm1Z7oe0SfCjVgLkvler5fCC/S8dSwht45VWCGRPqN+M IpbmziUGk1R8OHkKgD73pCZ4Xw== X-Google-Smtp-Source: AAOMgpd4/5+kqjjxYxqRKpVxdE61LgOii/hMrmF+KCZekFMT+4OnRt0dMNenbmtMv+5vfjLhbR8MOQ== X-Received: by 2002:aed:3cae:: with SMTP id d43-v6mr7774851qtf.379.1532726616517; Fri, 27 Jul 2018 14:23:36 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jul 2018 14:23:36 -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 5/7] dt-bindings: net: Add clock handle to Broadcom iProc mdio mux Date: Fri, 27 Jul 2018 14:23:31 -0700 Message-Id: <1532726613-6483-6-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_142348_027457_7A781C5C X-CRM114-Status: GOOD ( 14.09 ) 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 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; } From patchwork Fri Jul 27 21:23:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10547755 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 1455B139A for ; Fri, 27 Jul 2018 21:25:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0372C2C541 for ; Fri, 27 Jul 2018 21:25:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EAF532C662; Fri, 27 Jul 2018 21:25:38 +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 99A622C541 for ; Fri, 27 Jul 2018 21:25:38 +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=ziNkIz5HBHtd3Zo1Qnu254ocA7OWd+8fZ/VEMrIKIiE=; b=dYJM6kRjEcO3mi/xwy5jgT+4NU mG1f3sUV73W4NlSJLJt+p7ndDo9GnPEWVVfEHp5gmrhfBA1bCGV8l6c5r5/B7ntHT38hhnzKqlkM4 cKynugGA7B8VqpRFJUsGF3AfKMz9oJK0PwcKlwYjrzevABpT8FU1B3d1yKgWKfruiEOyDFdDiUihI 7HHbZ8uXf69MQ29THT9Cqw7Ws4i3c3F2Yn7d6pP9naB1Gz3yK1AgmGzFWUQNbRl+SmMcdYQmu2UuW m0Yp3aSk8sNuv2tlkrPgfkcCqP5WX6+G5kZTsNBHdcsEMguUWFQA11qI9DA3TZBYKr2usPDSiUn89 vaJv7zMQ==; 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 1fjAEv-00010m-Bs; Fri, 27 Jul 2018 21:25:33 +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 1fjADJ-00075S-Qs for linux-arm-kernel@lists.infradead.org; Fri, 27 Jul 2018 21:23:55 +0000 Received: by mail-qk0-x242.google.com with SMTP id c192-v6so4223631qkg.12 for ; Fri, 27 Jul 2018 14:23:43 -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=0ogW1NFRN4aOL8E2KY+5+PQwBZjlherVYGuxwPJtFmI=; b=eSMMhD2Ipzrbm/K/jrt4buWJYqIi9coI/HClew6qyJHhgpJr4gZQJlr2yc+sRvFRZW j6rS5Na/fcrmEC9cXvvUQF9xM/VXGFKxyPFL+7kFu1kiAzwKOE8yr15oDd8NHnK1eDoz wnBD1xV54QRgz+7Je2Yz2ay/vSZFj1Z4QZMSE= 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=0ogW1NFRN4aOL8E2KY+5+PQwBZjlherVYGuxwPJtFmI=; b=hYQKMgSKi6lGwQa3/DokGrsMKG4pP2DaTs0kbeYCCCgvK0gcWgQBvnedxYExeUw+Oa 7sWGGYnyTQ+CF4+UwmnyTVG+7q/6RKH9R/FHdJ2+ElNcw7Zu1chIik1/9AinA7Zwq1os sJK4vPVjEchNPdE8xj39FCLR/nKab5/ZrBTY65unotC99o4QhpY+0yAi9aaXqFgXjjHt SWTG6yd5U0k8zU4293rz1wLwrjhr5qZ2MLP8TdvqncJTqUasQCUy/XU4JhBbqCOnLb4Z zx0soCcEwtFd2gmWf2iwwNvVyfp3nSIYYqtYyJcaX++xiC03T9ybSfvYBbr3yXexHi9V Rtsg== X-Gm-Message-State: AOUpUlHLlWK46XPTbvNSMggnpluLP6GP6ALzU/FgQBipa17IgbrBDA3N nmH1/nvstAaRFF6fOKgosJ4e7Q== X-Google-Smtp-Source: AAOMgpfWlUnKHE0cOmpBrNoFFGEv4JSBhIZ+XC3j9D1lggej2K0WqAUP1g+fJG9Wx3LJfhvSG4trog== X-Received: by 2002:a37:8e46:: with SMTP id q67-v6mr7147729qkd.439.1532726622482; Fri, 27 Jul 2018 14:23:42 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jul 2018 14:23:41 -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 7/7] net: phy: Add pm support to Broadcom iProc mdio mux driver Date: Fri, 27 Jul 2018 14:23:33 -0700 Message-Id: <1532726613-6483-8-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_142353_868776_0BBF3C9B X-CRM114-Status: GOOD ( 16.02 ) 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: Andrew Lunn --- drivers/net/phy/mdio-mux-bcm-iproc.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index 51d1003..d89dce0 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -290,6 +290,33 @@ 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 iproc_mdiomux_desc *md = dev_get_drvdata(dev); + + if (md->core_clk) + clk_disable_unprepare(md->core_clk); + + return 0; +} + +static int mdio_mux_iproc_resume(struct device *dev) +{ + struct iproc_mdiomux_desc *md = dev_get_drvdata(dev); + + if (md->core_clk) + 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", @@ -302,6 +329,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,