From patchwork Wed Aug 1 17:56: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: 10552767 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 31A69157D for ; Wed, 1 Aug 2018 17:56:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D6E82B907 for ; Wed, 1 Aug 2018 17:56:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21B0C2B912; Wed, 1 Aug 2018 17:56:50 +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 CC92D2B907 for ; Wed, 1 Aug 2018 17:56:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RvKhvfXqrLUsA5Gha75AKrKCDCh9mqXwUbSzcXJDZ/Y=; b=fie/KRTVUOc1SDD+VfvIegJ8No XbS/9RCkuOSkqlLD52zrTGbW6VrHk2xFfVP54seVWoPZDP/sItHmSgp9M2iSnyzGsa9uahM18cn54 wmTN3Bw9nEtrsfMVBuSA4+K6ftdy74qWtGhLO7amW0pldTRF3TVrVPXyD/Q1/WrwaHLNDEwDZWhf/ +VKiXULSJPaJ3AV21fPtlRXVmZH20RfUMDypd4eex1z/LY5KW2AgHy8hwuMTzaTsdrwME3LQ5DsIg VwCSyy2hEkRDcEo3cDQOiETaCyI0xBPP9Dpxh5JgGDh0ajn/THVciHb9fmh6dO6f5JBBE8LjYURw+ LCqUmXkw==; 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 1fkvMb-0002Ci-4X; Wed, 01 Aug 2018 17:56:45 +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 1fkvMI-0001iB-1p for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:56:27 +0000 Received: by mail-qt0-x241.google.com with SMTP id n6-v6so20886984qtl.4 for ; Wed, 01 Aug 2018 10:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=189DY+gaLXQRLRw2y8y5yRwb7CdtbfhSBM5/gsjAGqM=; b=UzWlpLXz5jOPaOtgvEk7BikHmnOejMqTSjm0cfixQPGei1XgkC4+5spEli3ualHqyn HC2bOqIqQ7YVmSGPXYNRvJJdY96GMjMcHCaGS+31x0Ajl/nhSM1hGaqig1uCOh3uF+w1 AZEIlDoNFX2Xi8KN7o82xtBhvCBVmeU2M7HcA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=189DY+gaLXQRLRw2y8y5yRwb7CdtbfhSBM5/gsjAGqM=; b=KVd5ej278Bj4x7a9TM7hivW/g/ZBc5eZ5vy/momt2kxOWLe3DTpMHtK3ST597wOEzx F7X4kvTKxkuUKLzeF759CpsAyhfnmdBLFvZlXc0tOq1aBIMoYUCM1/uDFKIhHmHgjoC2 jKt04Cln2Sqd7n7huKxi9YGiC/5m2MuDZsyUgRCPb2DayvPxnW5c6sH/JxvzF0NwMWNL hzfJ5FuM6yhGE/Z8vz4GpY1We6nYcX8O87HWl3vYmyatMMkJVv+FPJ3A8VrJkPPe9QjH F6iTdd9rIQ4vHbfMsjdihz3z39c/s67cQPVpYB7ZQsdg3xb7g99edyec0ZsI0mkKgCDm 9f3Q== X-Gm-Message-State: AOUpUlGrleGMKbU0pNSFEk935ptygPTCKku7dECWof38m6TheH8elZdG DGmj/GLAA6IzA8ZGrkMNjuJDLw== X-Google-Smtp-Source: AAOMgpeCYpSoMAdGRJlBpHxCDECD3CLJlNld5Kcra0YXrAno4F8DyeBLNMIRebevOBQcCBnIoa4hsA== X-Received: by 2002:a0c:c993:: with SMTP id b19-v6mr24412131qvk.95.1533146174934; Wed, 01 Aug 2018 10:56:14 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56:14 -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 v3 1/8] dt-bindings: net: Fix Broadcom iProc mdio mux driver base address Date: Wed, 1 Aug 2018 10:56:19 -0700 Message-Id: <1533146186-8374-2-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105626_090707_121A2F1A X-CRM114-Status: GOOD ( 15.52 ) 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 Wed Aug 1 17:56: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: 10552769 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 9D2EE14E2 for ; Wed, 1 Aug 2018 17:57:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9918C2B907 for ; Wed, 1 Aug 2018 17:57:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CF682B912; Wed, 1 Aug 2018 17:57: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 2A9AD2B907 for ; Wed, 1 Aug 2018 17:57: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=N9suk1yUwnN5H6QfLnEIGbJHSxDDwtuEt76/puGD9RQ=; b=Oh82xpTIivoQeJjIHGnrnjM8XW qugQsASNZEC1yNlTA71pIMW9LHN10sas0rvjLnYwAGOQjwOW92ZyEtAkgPcFICckatlIkR4uSsx1p Lrac0cx4vqs2EH6JKmgXyc/RSvpdve7UrFJXEQaAv6rle9bwAeC9DTfOAwNz4A2ozkXHVEKtAzaB3 /opCRPVJnjKGf4DlncAKUgCJvvPAW8Um2teuVjpiQ9QGuWAqPczGJiOMoZxtwQJcOxSc8PxjQGDWm AZFTgYqGXDSxFYDu51VohZuTOUbMbE8jXoAilZdGHpCmisKptbB/nC265N+zXt79B3+deZYNlpWB3 meHCRhDw==; 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 1fkvMq-0002X9-4H; Wed, 01 Aug 2018 17:57:00 +0000 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkvML-0001iN-GT for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:56:33 +0000 Received: by mail-qk0-x244.google.com with SMTP id 27-v6so13279038qkv.0 for ; Wed, 01 Aug 2018 10:56:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VsjrZXC5OpUj/mRiqlhQAUbom/HbTgymFwHCvgsVH+Q=; b=UkbAAYkwE2gu12HbAzYfSoiYhCVdI9HTJefzYMB5D9sexJQxRqruuXlzfZKbaVX0FN 35hXX798+Kp1T9S09HSk4bIGJdH0/BrMqHSlFsdbW3k02P8KdhbyvyoCnlPBeKwEyt7S j0ewwRBwIbnaV4Ep0BmB0m8LMRqUg/z2UxeI0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VsjrZXC5OpUj/mRiqlhQAUbom/HbTgymFwHCvgsVH+Q=; b=B9Dt/UWqmgFDD/WVSELH0dmg0pQPsKabC6ImXctl8+/gyctoJqa9oV3DlxsPXq/Ovu JbGZ1VUXbiobiwuKUR/rK7WRV1uGIgW6BkWb1DW03/M5rMVNTcVjCmzrsrWlYNJogkCx OewBRU96sK+WXRBS9gl0Uil8DhEt1XcVTkxC7yxPCeLEuSk73B7UKJP3KTz6/AjiM+rP tMNjYgI3QkZSoiXoNfsKRSyEx7sCqPIXjaOuNqd8tb4uxJo3ojkSa3F3xjUnbQjZb8e3 jp2idPOr8/SxMl8/Tq8w7LI5p/FF1Ng6oZGRXl/qvJKgiWZYSM2eQtmCsczoCeojw3Fw rNGw== X-Gm-Message-State: AOUpUlEJ5Zb7Mt5zysrtlvaSRLL/O/TDVB2fqLxU25APzzGBe2pTuUZJ GTDp6SIddYBT8PSLQZmMjcpcUA== X-Google-Smtp-Source: AAOMgpeYQYGuDQM3wU3CPgOjA076imUVDu/zQuFvYTEAMfNHOtQlI6PNVFR21z6aH2M9QGQK6cuQkQ== X-Received: by 2002:a37:8f41:: with SMTP id r62-v6mr25449255qkd.412.1533146178315; Wed, 01 Aug 2018 10:56:18 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56:17 -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 v3 2/8] net: phy: Fix the register offsets in Broadcom iProc mdio mux driver Date: Wed, 1 Aug 2018 10:56:20 -0700 Message-Id: <1533146186-8374-3-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105629_843505_350134FE X-CRM114-Status: GOOD ( 16.99 ) 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 Wed Aug 1 17:56: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: 10552763 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 4C91013BB for ; Wed, 1 Aug 2018 17:56:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4663E2B907 for ; Wed, 1 Aug 2018 17:56:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3934E2B912; Wed, 1 Aug 2018 17:56:32 +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 0257B2B907 for ; Wed, 1 Aug 2018 17:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=qUw1VCYz7JFqRtLUdfn89qisYP77qQumLYMiJc6nsW8=; b=UxC42Y8sl5stiQgpvvpk5CvYof zXuRrddyiZrmgQYLp8Pxpw620IxrTFikZKlkbz2kBhaJ9aNvNRSicFv7OF08bWLEzB+TEvC43PgSm 28sxF8lvGKm6qA2PHJNOLmtAGWR5tpShPRQumSES4QQqeXyAD+ZFL9Icc0t4Wa3/u4xDUiel8BN03 XIS92Q7P1LGkgrzhOzLNnqpzrjlx4ytBfwc6oWnCMX1Jz27bcRgVTd5yCZFbQCGgNmpIQrplIxDtV FzKuirdWuJ5Dv7MOK3zdYhzIioL7tb/90JbRCuVGssSkBwSJrPpl+22ysBNVdDW2iJ3F7E4m9iRFf QNO6HVFA==; 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 1fkvMI-0001kM-JF; Wed, 01 Aug 2018 17:56:26 +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 1fkvMF-0001io-6b for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:56:24 +0000 Received: by mail-qk0-x241.google.com with SMTP id t79-v6so13301052qke.4 for ; Wed, 01 Aug 2018 10:56:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RwD94yFvz8u5xZo/C2EuBOqHrdsbi50cG7BNSdHptbM=; b=EDVd+ywnk47fk/zUjFgVH6f2smjy3L+v5UhNPEHZF78YHEQT0MplbRJDWbA8MfYQW1 NMS81m+1HEpwtgpsVbQLk3kOHk9cXltM7TfDuUC7O6UOtG4kamo/jJBkB5tlgcmZjTks xW4wueDTz1P/3vOCDbLoI7AqW98PBELkg9s10= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RwD94yFvz8u5xZo/C2EuBOqHrdsbi50cG7BNSdHptbM=; b=RhA4xtSM3e4e/EjVw8ByNzY9hoEYqEjrYMacK3sIDSjQZakN/kYNArsJHfWOfOPxhf 6wCNZZ9EJRr1r0GPfIK8ZA+JxERVGjvGfv3PmQRd76iZmagbzqBZKjnjpI2OPIVaRZLT F9TuDlCJ/SY/3kw/6e04jSCN97oJdSC5v/7ekCJzDP9DQ3wgKo2rPtH54x2jze5YG7Mc 6cPg6lHPFfIwH96FixJlB7pDCl3d4gxVSyZPZsfM8FZ0uwP6yQ//wJILT9NQrlbyXven qEMdSAUhvsdec+Z/0Td5gHJI6rfGRfZ0dbqtiwsRnYJ9q0s/TnxHo8q8q0upcFyVSkOE nd4w== X-Gm-Message-State: AOUpUlFhqOUG7QHPtMgUJq9cUiV021WRLvMGBfQBUKgo4J0SqBb/30wF iRKTNYFlFCi3bOSLD/w8fkPlbA== X-Google-Smtp-Source: AAOMgpdSR1A7ppHaQgRSMXUHBZYW/vY5S15q1v+ksXewdZUr5kyojdSeg/yLg1RHv25+JXA6JOxtTg== X-Received: by 2002:a37:5d02:: with SMTP id r2-v6mr25160263qkb.22.1533146181625; Wed, 01 Aug 2018 10:56:21 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56:21 -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 v3 3/8] arm64: dts: Fix the base address of the Broadcom iProc mdio mux Date: Wed, 1 Aug 2018 10:56:21 -0700 Message-Id: <1533146186-8374-4-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105623_248187_56279D36 X-CRM114-Status: GOOD ( 16.49 ) 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 Wed Aug 1 17:56: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: 10552787 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 81865157D for ; Wed, 1 Aug 2018 18:05:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7918D2B9F8 for ; Wed, 1 Aug 2018 18:05:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C7552BA0C; Wed, 1 Aug 2018 18:05: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 12E3A2B9F8 for ; Wed, 1 Aug 2018 18:05:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=qaNvnaMmEcgYfJy6Cshg0J4B8ilKZ3sDB1V51g3Nh5I=; b=oT3zH5bKz0QmhHlangY4q5NNdC JVTKmn412qg5GDyWQkTRxEkBNwMaDnaTbtyaabWycJ/MKcnRWGUouCnTnc9NK0szwfVd00FvaMglU FcOfwkCIYNkOnUB3B8CrHOg/OVUfGGrpngJZqyLocqGbgzXTCj4FnO+eDGiNjJNUrD0yc+dKoPuyS DDxifQFDsCZ2ycp1vUYQX0Qp7w9ZQevgnKR9tZXVaCwpXgK6j+QJduKA00zpmCF+2lfwHf235UWdV R/5x+XkEbgz76nagj9xpVDbwEMSpQ8/gBlzcdDyem5urERDU/bhLZkFgLxsZBkV3W5ft9DYsEQkF/ mDohRQmg==; 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 1fkvUz-00085y-W9; Wed, 01 Aug 2018 18:05:26 +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 1fkvMS-0001jv-4q for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:56:41 +0000 Received: by mail-qt0-x244.google.com with SMTP id y5-v6so20843646qti.12 for ; Wed, 01 Aug 2018 10:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Nf12dmutfgCfp/0jaiDAW47A5xaVfjlLX5su1g70bm4=; b=IkrcMBqXejJbjiM9esDZ0KrloX+mFKyLKzB9nhDcjUYPH1D6er4lezIalmpfbsVeMX Ae7xzxcOPMbm4t9dOGA9jB2B8DcxW+yPutDonqgEMqZibeiAOOv8aE9Ek7HL8BEstxUR tfHQHydIgUSEQcplQwUvBZuYDChkAWLorSPxo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Nf12dmutfgCfp/0jaiDAW47A5xaVfjlLX5su1g70bm4=; b=r8a/AMpiKBGeHDMSscxcSkZw1Bn3bcklKZrfO5L3PnzVIo1ed49Sa+IE3Oj8Y6vaKU uLgUceEszG5M/H54ChxKayX+/zLGCIdJKovc3MG4gClwiVGrVhh8q6OBREbi2uyt/Ohs HufMtW4i5D/P/bffEmVykgxkTpULP40kTBCOcLq/osy7OuLlHx2+/h3WUpw40Wu1GYng 2TuQQ7BGUPRwFk1hDMdExDYMBNlRBn+STl0Ywb3WrbTNrIGEYojqIBwlIJ7PNkcINBA+ 2Fdv/usyK+KDXssAVaBA6WxnmJWzcOvWZH2QDTLwnhFQiTjUdTFB65za9y0CvbNO2lOf erGA== X-Gm-Message-State: AOUpUlFHgnH0SB1S2XUnmfyT+9PUxoaxunOqtSWikTyvP6ELmYmiba0F rZUTr1VvF2DiJiqrTbfnZhjofg== X-Google-Smtp-Source: AAOMgpfmhVFCO2E//aPsp2brBTIDzbbcNJEQ1NFN+UyQUdkP/y4t9PFcCW7kZDbt4CXIm8ACtfx2rA== X-Received: by 2002:ac8:3473:: with SMTP id v48-v6mr25139566qtb.400.1533146184959; Wed, 01 Aug 2018 10:56:24 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56: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 v3 4/8] net: phy: Disable external master access in bcm mdio mux driver Date: Wed, 1 Aug 2018 10:56:22 -0700 Message-Id: <1533146186-8374-5-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105636_723464_B3512B89 X-CRM114-Status: GOOD ( 15.32 ) 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 Wed Aug 1 17:56: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: 10552773 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 D43A0157D for ; Wed, 1 Aug 2018 17:57:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF8FF2B907 for ; Wed, 1 Aug 2018 17:57:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C40F72B912; Wed, 1 Aug 2018 17:57: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 64FE72B907 for ; Wed, 1 Aug 2018 17:57: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=7aIJsNNDiRCV0Gg8XWotrd7DwsGR6EEUk1yBBv+6XD4=; b=BIpahIE0N/FjVSjlxWPCWOaokC X5T5Ay4Cjb0bv7Jnl0DvtT4eL0uk79s3xghXfauMbtcxyrtZdtMKjXIEIHn5sEDTSKAkNEI3l4Uil m+pxvy5msayd/wyK2N01KbzF6TkHrEKqcKKywxTXSZqZ+b3xmHNVZjyd+Y7jvj7PeuTlxdhK4p/41 BnA0pZhecsl5BrNUltXRP/9LwxYWWCyW0IsxMYfeNAKsMUs71DSxIKaleGPunAKkE0q2Bv6W6RD+B 86RsllvMqytwvcb67oyC+efrcOGU8u1sP1n1ADTrYQLTCEtVq6L1QdqjVkXjC//O04vbR7iIO2L/T friYBNkQ==; 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 1fkvNM-0003Fj-8r; Wed, 01 Aug 2018 17:57:32 +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 1fkvMV-0001n4-6T for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:56:45 +0000 Received: by mail-qt0-x241.google.com with SMTP id z8-v6so20862957qto.9 for ; Wed, 01 Aug 2018 10:56: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=KwrDBNo657A6SiUK12ekfX5MSVNPn+Tny6h4zOx1v7o=; b=ADN2M//OHKi4uiNBD4q4CyciI935grsJgXSOUkJwYhzhPZVKgyT+VgZjqFuOD6ucxr 8ejwydIZVEaeYsEt25pf+kdEsuiC9wJu78XjctwqGmEjh6EdnnXgjAESQi4OoKQJ5bqq Cmn46dzQI4iJvPd2hl6kqaQEZpah4q9JiWQiE= 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=KwrDBNo657A6SiUK12ekfX5MSVNPn+Tny6h4zOx1v7o=; b=INAlMaZBkXwIgyeXIT8zh286Fw1QkruZBotA2TNT8nMeusySE03LxSyOJXDVH7XjZ+ qtCxdcczbvNFudf8crtyCi1Exk0iES2RV9oYiF2yJGTT44LxHq3x4OniR6pc2IpmjyMb AtaM9yzBY6b+L3YDKJBX9XeesgNSZENwGOA3JkUwA+bnOw6U3QTa8F9yAz39MEgvonHZ CgvusESY1nDkSr0asUDkeLXmQki9TXm92EkJmtsonGXPXpHSQhV8YXurxUgBUdSTJz2G n7BYjIYUrmv9GG8ptDlmdrFJJ+tCW6YidhzZ5nLcIVwyZFchb2S0IWuuya9SrLArsd9b 7SQA== X-Gm-Message-State: AOUpUlHj1iwKlAE6s+muHdB0huppWIAakMnQ/VySMawm0VzimOcDO7U0 lA+PICRJTwnXSKxuj6SPZnlY1g== X-Google-Smtp-Source: AAOMgpdeIzDT19HL2XwHdCup+oDoPcFUrlF5G9CZMuof/QyUlZggaOLonbM2/sAVZrSVx/lu+EfdZw== X-Received: by 2002:a0c:d24d:: with SMTP id o13-v6mr23305952qvh.210.1533146188321; Wed, 01 Aug 2018 10:56:28 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56: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 v3 5/8] net: phy: Use devm api for mdio bus allocation in bcm iproc mdio mux Date: Wed, 1 Aug 2018 10:56:23 -0700 Message-Id: <1533146186-8374-6-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105639_978574_6C3C36FD X-CRM114-Status: GOOD ( 17.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use devm_mdiobus_alloc() instead of mdiobus_alloc() in the Broadcom iProc mdio mux driver. Also, clear the driver data on error from probe or when remove() is called. Signed-off-by: Arun Parameswaran --- drivers/net/phy/mdio-mux-bcm-iproc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index c36ce4b..5640d78 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -198,7 +198,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) return PTR_ERR(md->base); } - md->mii_bus = mdiobus_alloc(); + md->mii_bus = devm_mdiobus_alloc(&pdev->dev); if (!md->mii_bus) { dev_err(&pdev->dev, "mdiomux bus alloc failed\n"); return -ENOMEM; @@ -217,7 +217,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) rc = mdiobus_register(bus); if (rc) { dev_err(&pdev->dev, "mdiomux registration failed\n"); - goto out; + return rc; } platform_set_drvdata(pdev, md); @@ -226,6 +226,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) &md->mux_handle, md, md->mii_bus); if (rc) { dev_info(md->dev, "mdiomux initialization failed\n"); + platform_set_drvdata(pdev, NULL); goto out_register; } @@ -236,8 +237,6 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) out_register: mdiobus_unregister(bus); -out: - mdiobus_free(bus); return rc; } @@ -247,7 +246,7 @@ 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); + platform_set_drvdata(pdev, NULL); return 0; } From patchwork Wed Aug 1 17:56: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: 10552771 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 8E1BA157D for ; Wed, 1 Aug 2018 17:57:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 894F82B907 for ; Wed, 1 Aug 2018 17:57:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B72B2B912; Wed, 1 Aug 2018 17:57:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A5092B907 for ; Wed, 1 Aug 2018 17:57: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=JMr50vwxJ4qJ1ezf045JWLus6XsDUTZTI6X7NkmMKXg=; b=WPG0Sceu60tt4+eSZ0CfdajbcN d4on6wA588qd1vivDvEp21PtZtOLXT671/fhR7Y0yyBKua93VzILIA+YtXejRfZegT4l3PQtiMY2l 6rA3hJj1vvSWACV8QC+5oaqPrfJpwMPwyU8yvO6TiytvCge7Eroslh6v9dkrSiST5wcTdVJuklroR 0cVWKfIXDYVmIyawtt5LtRfZeH5IhdTOIexweAJ5X6TRMPjSHXPpo1aVoIsQV3AX2z4q86foMf53q vK+3puSidm5ppd+YF0f5jLI2hv4ozaUAVEWal2ybYOW9Iy0LIonrSPfkp8DhwVpQ/dmFaNK1kL0Ye GWzbClPw==; 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 1fkvNA-0002z3-89; Wed, 01 Aug 2018 17:57:20 +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 1fkvMS-0001sU-4v for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:56:41 +0000 Received: by mail-qt0-x244.google.com with SMTP id q12-v6so20856803qtp.6 for ; Wed, 01 Aug 2018 10:56: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=UBoiA9B2sqMzS5oHoGN2NkkLQkeS/0hG8NCGBeKGHho=; b=J/n54SD3FB52MVWbzlzObnZzEbscLfE5RhCFwr8chw+QZz/pWA/C5+XR//uW+1aBzV pNptOPk3jBTjfe9CIDxEVtQfOjPtOxo48vZ/p2SkS6OA52k0VHFHGnTN+XC8ZP/EORl6 VzAKrv3nLfSA4rNo7jh8uNcQoKGC694BFTDS8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UBoiA9B2sqMzS5oHoGN2NkkLQkeS/0hG8NCGBeKGHho=; b=GoxHu5Or8Mn+d3frMJvpBdCxjf5A3oKl7ZgM9WrxBt8lxjMoz+Ls5cjBQLlVt2nv0K sYoySsuCVUWvwTmfm8GG4N2LZvZ4zNY90zOuiLUcV+WjlfHYcS3/pCApsttqZwCKJ6RZ PWSK1AmKUymE69H16Z2oa+2k5QEgDnBFxhrDFcbjdJ591W5siuBxs+4x2bEIEYUfnJbo 8Vd4k0jkeg3rLjtVkEcEFzgvmu5gWuK5cTtNdnrmFIftfEA35n0MJFzLOC3qP0WPFLP6 uDZZubftwvHv9Hef9TqYTNtet2xOc0tFVzzKFnVGItkldSi5B5EZf0erAs0ccAnmrlV9 3rgg== X-Gm-Message-State: AOUpUlGXH8Zz0WDNZB78F2UuRcvaXWUgYjY9qCaTfBQpIQOgv795/WsA 2R6/3HXFZoFFTv3g25Soyd1Exg== X-Google-Smtp-Source: AAOMgpcVev4UGWLJhjn3BjqqOR3QrfMXu+8wRwA95bkdY3hDo9jIOrVQoIY7Vm1q46HcwtenQF0C+w== X-Received: by 2002:a0c:b792:: with SMTP id l18-v6mr24509355qve.110.1533146191961; Wed, 01 Aug 2018 10:56:31 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56: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 v3 6/8] dt-bindings: net: Add clock handle to Broadcom iProc mdio mux Date: Wed, 1 Aug 2018 10:56:24 -0700 Message-Id: <1533146186-8374-7-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105636_926505_3794F041 X-CRM114-Status: GOOD ( 13.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 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 Wed Aug 1 17:56:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10552775 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 DF04814E2 for ; Wed, 1 Aug 2018 17:57:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4C652A7D9 for ; Wed, 1 Aug 2018 17:57:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5FEB2A53D; Wed, 1 Aug 2018 17:57:47 +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 4911E2B7DE for ; Wed, 1 Aug 2018 17:57:47 +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=MGtBsqHn8BgsYSz+O4TGzvReW7KnthTVT7c9FsX56ys=; b=b6OvLl3AXbpj+lKopcUemV3tAl 5WqfciyTQDyvJuekHmgzCHf+qjZUTuB0jD1PJ5WovmnSxx7SbYF6hDjcRlZ5pxfedY6+OJNnPicBc 6jZlEOTjB+dyz2sv60NVc2cDb+i+7d6owgaFitJmAWkJQI/4ap5hI5IiLtF+uC6jR0REYQeYyFehv ywgf1ymuUkD2HdKezy9pbbv/YP4VH+Aw1+4/8CXWRPScONemygD73bPB3Wk8bqJPiGOSbqXUt2YfL ZNxS/za4d2eZR+1/sbDl8hqktDd4rmdgRylyRpACaCKKhzeausNFRFgf9ACQBQR6TW77mLeEJddDT ir2mvblw==; 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 1fkvNX-0003YQ-Da; Wed, 01 Aug 2018 17:57:43 +0000 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkvMc-0001xp-NH for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:56:57 +0000 Received: by mail-qk0-x243.google.com with SMTP id b5-v6so13290074qkg.6 for ; Wed, 01 Aug 2018 10:56:36 -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=DnLLkthm42YQbd+dryksrlRSy+2l4mH31DE5DMQIPos=; b=eQQ4q2DNtl8oadOPh0su54bcI1Pem4/CmScBZaKFfAxjPQfFLR4b0nnEQ6QgSnBSE3 cBEP0PoqtidkJRO2TbrCtv1fq5K6EQ52CavFx6TzZ4+befGTl68ZutFEeBW4ZT0V1LLP yfR/i0earUQweKoBf5HbP+QD6ULUBlR0PkYcM= 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=DnLLkthm42YQbd+dryksrlRSy+2l4mH31DE5DMQIPos=; b=nbHuZ8v5f2dmtyvVfj33O+DF2VYG2kXuisTAkbR+02bNrD3ugZsECK1STO7mMwWbTq rJc9pZ2V5PmVo75OETWUVVTziIeVkvJj47GPOxqG6vubXxwecIUp2/S1I6F/zRkB7tZg nKLr95kSzxTZNJIs6a3bvGaQUZKg7ZQEV/KoptIb7LNrTzLJZIZo/qSWcdyyxCWifRLR c0c6qgav/Z0XmyAk/SFP5pjHClEwdXRUe/SakK2SvwC2CoSN5exawvAXAhS9PgEHcgE3 BjnWgaluoTGP7wfeRp+ID0uN0hWKkpCtiAk9PORc3lIvDUjX4f8vOlsXPj16OxphXEBR R70g== X-Gm-Message-State: AOUpUlG/IA0vhEvbz7qCyE7I3ubX6jOF1IT2vGAMdtDzbQKon6DMZsG1 b0m7vKzdsBMGl/ueez+0UeqgXg== X-Google-Smtp-Source: AAOMgpc2c4M0krfL9EpCtmVD9VsHASUs9UBczWisrNM3pQUHQUk/XMjhLq7siClB4dd8e3hnBiml1A== X-Received: by 2002:a37:2121:: with SMTP id h33-v6mr24810138qkh.319.1533146195322; Wed, 01 Aug 2018 10:56:35 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56: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 v3 7/8] net: phy: Add support to configure clock in Broadcom iProc mdio mux Date: Wed, 1 Aug 2018 10:56:25 -0700 Message-Id: <1533146186-8374-8-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105647_356523_6E52C70E X-CRM114-Status: GOOD ( 21.64 ) 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 | 42 ++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index 5640d78..5127010 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * version 2 (GPLv2) along with this source code. */ - +#include #include #include #include @@ -22,6 +22,10 @@ #include #include +#define MDIO_RATE_ADJ_EXT_OFFSET 0x000 +#define MDIO_RATE_ADJ_INT_OFFSET 0x004 +#define MDIO_RATE_ADJ_DIVIDENT_SHIFT 16 + #define MDIO_SCAN_CTRL_OFFSET 0x008 #define MDIO_SCAN_CTRL_OVRIDE_EXT_MSTR 28 @@ -49,21 +53,38 @@ #define MDIO_REG_ADDR_SPACE_SIZE 0x250 +#define MDIO_OPERATING_FREQUENCY 11000000 +#define MDIO_RATE_ADJ_DIVIDENT 1 + struct iproc_mdiomux_desc { void *mux_handle; void __iomem *base; struct device *dev; struct mii_bus *mii_bus; + struct clk *core_clk; }; static void mdio_mux_iproc_config(struct iproc_mdiomux_desc *md) { + u32 divisor; u32 val; /* Disable external mdio master access */ val = readl(md->base + MDIO_SCAN_CTRL_OFFSET); val |= BIT(MDIO_SCAN_CTRL_OVRIDE_EXT_MSTR); writel(val, md->base + MDIO_SCAN_CTRL_OFFSET); + + if (md->core_clk) { + /* use rate adjust regs to derrive the mdio's operating + * frequency from the specified core clock + */ + divisor = clk_get_rate(md->core_clk) / MDIO_OPERATING_FREQUENCY; + divisor = divisor / (MDIO_RATE_ADJ_DIVIDENT + 1); + val = divisor; + val |= MDIO_RATE_ADJ_DIVIDENT << MDIO_RATE_ADJ_DIVIDENT_SHIFT; + writel(val, md->base + MDIO_RATE_ADJ_EXT_OFFSET); + writel(val, md->base + MDIO_RATE_ADJ_INT_OFFSET); + } } static int iproc_mdio_wait_for_idle(void __iomem *base, bool result) @@ -204,6 +225,20 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) return -ENOMEM; } + md->core_clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(md->core_clk)) { + if (PTR_ERR(md->core_clk) == -EPROBE_DEFER) + return -EPROBE_DEFER; + + 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; + } + } + bus = md->mii_bus; bus->priv = md; bus->name = "iProc MDIO mux bus"; @@ -217,7 +252,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) rc = mdiobus_register(bus); if (rc) { dev_err(&pdev->dev, "mdiomux registration failed\n"); - return rc; + goto out_clk; } platform_set_drvdata(pdev, md); @@ -237,6 +272,8 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev) out_register: mdiobus_unregister(bus); +out_clk: + clk_disable_unprepare(md->core_clk); return rc; } @@ -246,6 +283,7 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev) mdio_mux_uninit(md->mux_handle); mdiobus_unregister(md->mii_bus); + clk_disable_unprepare(md->core_clk); platform_set_drvdata(pdev, NULL); return 0; From patchwork Wed Aug 1 17:56:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Parameswaran X-Patchwork-Id: 10552777 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 2AA5E14E2 for ; Wed, 1 Aug 2018 17:58:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23E612B857 for ; Wed, 1 Aug 2018 17:58:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17B9E2B8A5; Wed, 1 Aug 2018 17:58:04 +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 B8FA82B861 for ; Wed, 1 Aug 2018 17:58:03 +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=sHUa4BvEowDUYmNQblqx0HmUoha3R5smzm6cr+pDrws=; b=cb4zy6ub6omtdu4uALtZ+VIUj0 DR+Wqycojux8u2O5CY9P0PxKtUDOQjkR/ZI0EwwsiX70dj2FP/qrry2BCXzN2RytuBWErnnFUEDED kB2mbAmt3FwBnFdp1vaPlmBeKnTwL3YK5tJZU5vJrPRzKRqC64sidRi5NyZNIgfH3NN7jf6uCvyUv tn1ikcrIltj4H6ZaFljxbr+CTcm0cNa3wZ21zd2Pa9KVC4oe7dVTH3K7pG7X0rnJZAnYWWdcfUEoL l5i1mnDvNbt+mWqSJNxJNbejc+8IQpE2VcLaz3z7C0xqKYp8BdVbg97bfPDafktxTheHdbwTAxiRD fYxO/etA==; 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 1fkvNl-0003qq-33; Wed, 01 Aug 2018 17:57:57 +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 1fkvMf-00023C-T2 for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2018 17:57:15 +0000 Received: by mail-qk0-x242.google.com with SMTP id x192-v6so208433qkb.3 for ; Wed, 01 Aug 2018 10:56:39 -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=N+kIkDYP/D6+lxFIQ9EfJw/C6zC9oAhfDWWx9Ovhv9M=; b=Pl4NRqznZj2NDw6bs7H/bqjnS85Wyvn78vtXuUXvlkBENaHlrDcYgUTzSgM4noQNM1 xZEB+siPZ+Ex9+zDjdNz/hHo940Z9oxdbg6uu+6ckmQ7vFlQdA380pIPRVgo7nLbA3gh syF0QIE/9xG/40Et0WqrHlhYgIG/dlrGynAmA= 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=N+kIkDYP/D6+lxFIQ9EfJw/C6zC9oAhfDWWx9Ovhv9M=; b=KnMVrQcoPUDs81iOPgK+SXLZMX8vPeuDBXPwWybAvLJL5GIsc5WLl9VuMXgX/dCtVU uYXdyO3POTMejQc6LoBx1/MJRNwfiZSJaQ8dVpdRnrX1ibJ3CLEW4fkgIEFkRrKu9Daf atQqsiK8JPWlIZjbFARfKI64Z+d2YDs4Dl0M4J+kqcV99c9BtkDTkAYtSdjAeZ+5Pe3H qWz/xizFH6tTAzCxb1dHEyZBcCpUyq3SSCfUmcxru/uG24ns39YiiUVzJuwgDXLhMsnj 5kLFxIFijcwanEcHW1Si4fCxc2Ed+QhRVVGeATqe4GL/AoD1KTPgePTce72EkOIxmItu NMnQ== X-Gm-Message-State: AOUpUlEtTz3hs1giozFhcSC/DE3n1DYCq/BT1TAWPYBKNxJUcBX2jUvq 4ZSnDiVwo13U/ddb72alkaU0kw== X-Google-Smtp-Source: AAOMgpe9uSYp6c9j+Uxd8IGvbG+6SpQRgHfeVJq+EmgDcblIju84GsC4WsmGnBYbTZwq6T0QEMrABQ== X-Received: by 2002:a37:1194:: with SMTP id 20-v6mr26087359qkr.379.1533146198648; Wed, 01 Aug 2018 10:56:38 -0700 (PDT) Received: from lbrmn-lnxub86.ric.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id m12-v6sm14401729qkl.54.2018.08.01.10.56.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 10:56:38 -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 v3 8/8] net: phy: Add pm support to Broadcom iProc mdio mux driver Date: Wed, 1 Aug 2018 10:56:26 -0700 Message-Id: <1533146186-8374-9-git-send-email-arun.parameswaran@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> References: <1533146186-8374-1-git-send-email-arun.parameswaran@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180801_105650_601213_2410A49E X-CRM114-Status: GOOD ( 15.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, netdev@vger.kernel.org, Arun Parameswaran , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for suspend and resume to the Broadcom iProc mdio mux driver. Signed-off-by: Arun Parameswaran Reviewed-by: Florian Fainelli --- drivers/net/phy/mdio-mux-bcm-iproc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c index 5127010..4e2c51b 100644 --- a/drivers/net/phy/mdio-mux-bcm-iproc.c +++ b/drivers/net/phy/mdio-mux-bcm-iproc.c @@ -289,6 +289,32 @@ static int mdio_mux_iproc_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int mdio_mux_iproc_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iproc_mdiomux_desc *md = platform_get_drvdata(pdev); + + clk_disable_unprepare(md->core_clk); + + return 0; +} + +static int mdio_mux_iproc_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iproc_mdiomux_desc *md = platform_get_drvdata(pdev); + + clk_prepare_enable(md->core_clk); + mdio_mux_iproc_config(md); + + return 0; +} +#endif + +static SIMPLE_DEV_PM_OPS(mdio_mux_iproc_pm_ops, + mdio_mux_iproc_suspend, mdio_mux_iproc_resume); + static const struct of_device_id mdio_mux_iproc_match[] = { { .compatible = "brcm,mdio-mux-iproc", @@ -301,6 +327,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,