From patchwork Wed Feb 24 11:51:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 386954 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2B74C4332B for ; Wed, 24 Feb 2021 11:53:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C7DD64F08 for ; Wed, 24 Feb 2021 11:53:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235139AbhBXLwr (ORCPT ); Wed, 24 Feb 2021 06:52:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235121AbhBXLwo (ORCPT ); Wed, 24 Feb 2021 06:52:44 -0500 Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1518DC06174A; Wed, 24 Feb 2021 03:52:04 -0800 (PST) Received: by mail-io1-xd29.google.com with SMTP id y202so1708856iof.1; Wed, 24 Feb 2021 03:52:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o65TUS3eViNoH1/o8q9/8liYwdZx2oTvg/nkERWMHtU=; b=nkOH4+uQQYtUnFA/AuqMEmpTHZsJVuTfAbOLZm+yFHKbfIcMd9Q12EyiB4af8SMX8e 318DgJ5x4F/Qp7G0KArHL9+uK53+yvVBRCiBe1M8ovPfxeUUyJkkUmM1zyXW+taC1dYB a6wcg/BibceaW73Gnui/Bsr3WAJELrtcgHiJtPcYnANOnQdnmiZyguKM5NaLhY9Ku+dI xsVYdc3wANU12JQBZTQOQe8IfKzs9MjNv8wfrk39DpVPsaF5ed6egsa8yO4Zbc7Lk1EP P/3HKZHkX+H0wzPgtWM+3w7LCQFokhfZyV1hP98VPjxPENTMDuRnmeWNsk36obAb/COT CPsQ== 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:mime-version:content-transfer-encoding; bh=o65TUS3eViNoH1/o8q9/8liYwdZx2oTvg/nkERWMHtU=; b=cfozAv7mzAfje8i8gf1fr/BTWXGimsecRSw9O4So31K91rl8kaE7eSbTPwM7rzht+L SPRrHVFjcTzLy1cSh4CNDGWfg9NxEz2xAvUn+9C+ORAyRtGJZ9tskt/kMI9pwpBN1qgU kcwMt/dNvSFC0brPAIPNd2G1VzkAw4By90JV2X/quN21KscTHbaTZnEvuXYHEQ1sOo+u dC0KoTtP465gXzn39nrtQeI5sBRlC69IY5Aeoa2Frn2FDbnoHcZWjwFj6jl7It+qdbKa gfpYAz2d40CrAVlCgKi/HRFNHHEZrBLO7McU21wBtO82Qq+LnR1seyiuDnBv5q3/Z45p 57Qg== X-Gm-Message-State: AOAM532L0mKURUHBNFGtMzcHEiEJ6q02KBXrJ2L0KMOkjP+XA1rVlgga zvUXJk8yqAPDoq4fda34TNCFpRGQAcEBYA== X-Google-Smtp-Source: ABdhPJwxsG+6DFP2AY8TOGhSVHWhZRB9tbSGSvDBlHSP+At4BssZ9j6vHDBhbIf9XPi99a5YdcEH8Q== X-Received: by 2002:a6b:c997:: with SMTP id z145mr2945563iof.36.1614167523184; Wed, 24 Feb 2021 03:52:03 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:de9c:d296:189b:385a]) by smtp.gmail.com with ESMTPSA id l16sm1500001ils.11.2021.02.24.03.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:52:02 -0800 (PST) From: Adam Ford To: netdev@vger.kernel.org Cc: aford@beaconembedded.com, Adam Ford , Geert Uytterhoeven , Sergei Shtylyov , "David S. Miller" , Jakub Kicinski , Rob Herring , Magnus Damm , linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 2/5] ARM: dts: renesas: Add fck to etheravb-rcar-gen2 clock-names list Date: Wed, 24 Feb 2021 05:51:42 -0600 Message-Id: <20210224115146.9131-2-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224115146.9131-1-aford173@gmail.com> References: <20210224115146.9131-1-aford173@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The bindings have been updated to support two clocks, but the original clock now requires the name fck. Add a clock-names list in the device tree with fck in it. Signed-off-by: Adam Ford Reviewed-by: Geert Uytterhoeven Reviewed-by: Andrew Lunn --- V3: No Change V2: No Change diff --git a/arch/arm/boot/dts/r8a7742.dtsi b/arch/arm/boot/dts/r8a7742.dtsi index 6a78c813057b..6b922f664fcd 100644 --- a/arch/arm/boot/dts/r8a7742.dtsi +++ b/arch/arm/boot/dts/r8a7742.dtsi @@ -750,6 +750,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A7742_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi index f444e418f408..084bf3e039cf 100644 --- a/arch/arm/boot/dts/r8a7743.dtsi +++ b/arch/arm/boot/dts/r8a7743.dtsi @@ -702,6 +702,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A7743_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7744.dtsi b/arch/arm/boot/dts/r8a7744.dtsi index 0442aad4f9db..d01eba99ceb0 100644 --- a/arch/arm/boot/dts/r8a7744.dtsi +++ b/arch/arm/boot/dts/r8a7744.dtsi @@ -702,6 +702,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A7744_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi index 0f14ac22921d..d0d45a369047 100644 --- a/arch/arm/boot/dts/r8a7745.dtsi +++ b/arch/arm/boot/dts/r8a7745.dtsi @@ -645,6 +645,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A7745_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/r8a77470.dtsi b/arch/arm/boot/dts/r8a77470.dtsi index 691b1a131c87..ae90a001d663 100644 --- a/arch/arm/boot/dts/r8a77470.dtsi +++ b/arch/arm/boot/dts/r8a77470.dtsi @@ -537,6 +537,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A77470_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index b0569b4ea5c8..af9cd3324f4c 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -768,6 +768,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A7790_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index 87f0d6dc3e5a..2354af7fa83f 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -728,6 +728,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A7791_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi index f5b299bfcb23..60c184ab1b49 100644 --- a/arch/arm/boot/dts/r8a7792.dtsi +++ b/arch/arm/boot/dts/r8a7792.dtsi @@ -537,6 +537,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A7792_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi index cd5e2904068a..18cc6f6b588d 100644 --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi @@ -598,6 +598,7 @@ avb: ethernet@e6800000 { reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>; interrupts = ; clocks = <&cpg CPG_MOD 812>; + clock-names = "fck"; power-domains = <&sysc R8A7794_PD_ALWAYS_ON>; resets = <&cpg 812>; #address-cells = <1>; From patchwork Wed Feb 24 11:51:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 386953 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D239C433DB for ; Wed, 24 Feb 2021 11:53:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4BB364D5D for ; Wed, 24 Feb 2021 11:53:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235165AbhBXLw7 (ORCPT ); Wed, 24 Feb 2021 06:52:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235152AbhBXLwt (ORCPT ); Wed, 24 Feb 2021 06:52:49 -0500 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C261C06178B; Wed, 24 Feb 2021 03:52:09 -0800 (PST) Received: by mail-il1-x135.google.com with SMTP id h18so1465049ils.2; Wed, 24 Feb 2021 03:52:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oIqFjy2sxPsPKADV+56fV2GGjexKPCQIKDGcS+nsODo=; b=qBkJvqk3srrY0dAP9l4B9HESHDLf/T2JK5BLQam8N15lVY+rnJ/lXRefMujZ6NserB 5+Ri+/NaN0cZr4TMZxhrfCDQ+t2r5ok3mGRvkS9CRDYfGWusQGBqO+144+E2jpj1VyDy C+dNupFGIhPEdqfGuALXPYF8CDRdmvX+d8bVh/Dpwh1z2JKhQEclHoH9ltqGr0K0rANs MSrl6OBbzVOm3q7p6mD8izAlaXu8N7e5Xkw+cPnXpGYEA2Z5VjEtAX60E+t/ako+yUkY n3VFZkSuc8/GpkElNQ+DTneTL8AJ22RKMhBRm/Q+zv7t5iirvkkFV9l6Qe0ZEJpzfUkg M7DA== 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:mime-version:content-transfer-encoding; bh=oIqFjy2sxPsPKADV+56fV2GGjexKPCQIKDGcS+nsODo=; b=cFUOyAlmayHD/jpkyCOw5GGn4A7W3rn7NbZ4XpWvgAYp9Y/ttyPuLj01Q/erfuhe+u XK/3K5X+sS6zntFqwNp/NiFhCcJlFbFUQ6rxPlEemFOETOx0QUZWLoXuWlbz5zWopL6O lQ+xcQkgpBnlnPGw5TLZw7AIAgKdtZH42H2gPsgSaxlKi6QqrtyuoXZkB4XWSqNT9Jc3 VBvbIP1KuR2icc3CieA3/KMksmtLbTvYDRBIzHzTT6DokEEIdnBbsmSQlC2/5J8ycZ3w q0JzP3C5S0eXIyfJx13ymwPz2GA1iuf0WA+GswHtQ+W0lJ2hQjIEX3/GI1pVyicgsyFF I+Rg== X-Gm-Message-State: AOAM532Ahkg3e+rH/RWo6nq9c/smRhlGpJMX7rdr+cjXEOEqUZtJqaHp 6yMbNY+EDu2Djs+d+JM+PxwJtbcDhoF/Sg== X-Google-Smtp-Source: ABdhPJwAUnPND4FALnmGYMN3u2Xq0xn+btBxvYlpsPpff5iTqLa2G5BsJCAE6c0slKAFkbCxdd1aog== X-Received: by 2002:a05:6e02:82:: with SMTP id l2mr20771072ilm.185.1614167528591; Wed, 24 Feb 2021 03:52:08 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:de9c:d296:189b:385a]) by smtp.gmail.com with ESMTPSA id l16sm1500001ils.11.2021.02.24.03.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:52:08 -0800 (PST) From: Adam Ford To: netdev@vger.kernel.org Cc: aford@beaconembedded.com, Adam Ford , Sergei Shtylyov , "David S. Miller" , Jakub Kicinski , Rob Herring , Geert Uytterhoeven , Magnus Damm , linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 4/5] net: ethernet: ravb: Enable optional refclk Date: Wed, 24 Feb 2021 05:51:44 -0600 Message-Id: <20210224115146.9131-4-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210224115146.9131-1-aford173@gmail.com> References: <20210224115146.9131-1-aford173@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org For devices that use a programmable clock for the AVB reference clock, the driver may need to enable them. Add code to find the optional clock and enable it when available. Signed-off-by: Adam Ford --- V3: Change 'avb' to 'AVB' Remove unnessary else statement and pointer maniupluation when enabling the refclock. Add disable_unprepare call in remove funtion. V2: The previous patch to fetch the fclk was dropped. In its place is code to enable the refclk diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h index 7453b17a37a2..ff363797bd2b 100644 --- a/drivers/net/ethernet/renesas/ravb.h +++ b/drivers/net/ethernet/renesas/ravb.h @@ -994,6 +994,7 @@ struct ravb_private { struct platform_device *pdev; void __iomem *addr; struct clk *clk; + struct clk *refclk; struct mdiobb_ctrl mdiobb; u32 num_rx_ring[NUM_RX_QUEUE]; u32 num_tx_ring[NUM_TX_QUEUE]; diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index bd30505fbc57..614448e6eb24 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -2148,6 +2148,13 @@ static int ravb_probe(struct platform_device *pdev) goto out_release; } + priv->refclk = devm_clk_get_optional(&pdev->dev, "refclk"); + if (IS_ERR(priv->refclk)) { + error = PTR_ERR(priv->refclk); + goto out_release; + } + clk_prepare_enable(priv->refclk); + ndev->max_mtu = 2048 - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN); ndev->min_mtu = ETH_MIN_MTU; @@ -2260,6 +2267,9 @@ static int ravb_remove(struct platform_device *pdev) if (priv->chip_id != RCAR_GEN2) ravb_ptp_stop(ndev); + if (priv->refclk) + clk_disable_unprepare(priv->refclk); + dma_free_coherent(ndev->dev.parent, priv->desc_bat_size, priv->desc_bat, priv->desc_bat_dma); /* Set reset mode */