From patchwork Fri Mar 10 16:34:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 737471 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vftH63N75z9s7t for ; Sat, 11 Mar 2017 03:38:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="c8113tQ2"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934011AbdCJQhu (ORCPT ); Fri, 10 Mar 2017 11:37:50 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34526 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755387AbdCJQfH (ORCPT ); Fri, 10 Mar 2017 11:35:07 -0500 Received: by mail-wm0-f65.google.com with SMTP id u132so3114393wmg.1; Fri, 10 Mar 2017 08:35:06 -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; bh=c4bXB2PBXdtz7tpN+nOSEpL14tW0L3+EmUQPbcIbVP4=; b=c8113tQ25Uw6iNztqVx+0nO3V7OEgetuoLRr1UUp/bYt6ZtSs9DQSk4JFu67vhhq6k kZEBQrQ1ifVwD38LdLbFpEAVGGPAWa2m94HugWKXC7gNbVm2q54XaN7bOS2S1fso1lWO hsqZCtJvPiK0+oXEpBG3XPP5AFbv0CFQMM4s1yJ3b+tFNOeEwx/407NzdF5S5cT1rP2V UMWyv7g1pTkgjpIbPPfm1CqvkTEMZGSMmVikAX6jejqf+Vxzb5E1vB9IStIxV2zvrf7R A1+pe4OHM5nfZThqH3HxT/w3gzpaxpl2HijGFgyJQN9ME2vSnQNSNRdJjEWmETTiHTYJ a28Q== 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=c4bXB2PBXdtz7tpN+nOSEpL14tW0L3+EmUQPbcIbVP4=; b=EESs7wgt8ZAZgpn2Tp+n0se3q6guHHF6qQE954mQwsZC9+KZfSKqpx1yw4829VcbQR KHYEd5IJBwEFrlyAQdxjt4ukXXau9RZngbiaN18qz/SLjFSS6JyOgL0s6o9787TumUn6 xWOaMYZkenW/ANLRACMeQo9w/bDdWMD5YdIAM/WMOxzLvX8PlMlV5Pto0Y6IB1rQkXxH isukU8Q/LaETlKt4Y5jp3uPTElcJvarzXL6M3oj8d4WmeV1Kfzcuf2P1IeGHanvWLOTR poUdlOnjYF0XFpVZm1KK7ZHwTCykIPLbv48eFvy6QJz5ZrVuT3Y9dK2Efx6GgCbCqvh/ uOlw== X-Gm-Message-State: AFeK/H1HAcBJ45mkrALjNo2VubgrSyWjuPswmw+OB4oUH3yc2jHtlPC2VJ0No8dTrDJatQ== X-Received: by 10.28.126.11 with SMTP id z11mr3419529wmc.13.1489163705075; Fri, 10 Mar 2017 08:35:05 -0800 (PST) Received: from localhost (port-55061.pppoe.wtnet.de. [46.59.215.197]) by smtp.gmail.com with ESMTPSA id o15sm13499684wra.61.2017.03.10.08.35.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2017 08:35:04 -0800 (PST) From: Thierry Reding To: "David S . Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Joao Pinto , Jon Hunter , Mikko Perttunen , netdev@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Rutland , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v2 1/9] net: stmmac: Rename clk_ptp_ref clock to ptp_ref Date: Fri, 10 Mar 2017 17:34:53 +0100 Message-Id: <20170310163501.31811-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170310163501.31811-1-thierry.reding@gmail.com> References: <20170310163501.31811-1-thierry.reding@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thierry Reding There aren't currently any users of the "clk_ptp_ref", but there are other references to "ptp_ref", so I'm leaning towards considering that a typo. Fix it. Cc: Mark Rutland Cc: Rob Herring Cc: devicetree@vger.kernel.org Signed-off-by: Thierry Reding Acked-by: Rob Herring --- Documentation/devicetree/bindings/net/stmmac.txt | 6 +++--- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt index d3bfc2b30fb5..11b27dfd1627 100644 --- a/Documentation/devicetree/bindings/net/stmmac.txt +++ b/Documentation/devicetree/bindings/net/stmmac.txt @@ -28,9 +28,9 @@ Optional properties: clocks may be specified in derived bindings. - clock-names: One name for each entry in the clocks property, the first one should be "stmmaceth" and the second one should be "pclk". -- clk_ptp_ref: this is the PTP reference clock; in case of the PTP is - available this clock is used for programming the Timestamp Addend Register. - If not passed then the system clock will be used and this is fine on some +- ptp_ref: this is the PTP reference clock; in case of the PTP is available + this clock is used for programming the Timestamp Addend Register. If not + passed then the system clock will be used and this is fine on some platforms. - tx-fifo-depth: See ethernet.txt file in the same directory - rx-fifo-depth: See ethernet.txt file in the same directory diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 0ba1caf18619..f2d94eafeb0a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -359,7 +359,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) clk_prepare_enable(plat->pclk); /* Fall-back to main clock in case of no PTP ref is passed */ - plat->clk_ptp_ref = devm_clk_get(&pdev->dev, "clk_ptp_ref"); + plat->clk_ptp_ref = devm_clk_get(&pdev->dev, "ptp_ref"); if (IS_ERR(plat->clk_ptp_ref)) { plat->clk_ptp_rate = clk_get_rate(plat->stmmac_clk); plat->clk_ptp_ref = NULL;