From patchwork Thu Feb 23 17:24:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 731630 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 3vTh4D47G3z9s7d for ; Fri, 24 Feb 2017 04:26:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bDt5cN6A"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751786AbdBWR0H (ORCPT ); Thu, 23 Feb 2017 12:26:07 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34086 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbdBWRZA (ORCPT ); Thu, 23 Feb 2017 12:25:00 -0500 Received: by mail-wr0-f193.google.com with SMTP id 89so4638177wrr.1; Thu, 23 Feb 2017 09:24:43 -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=wvVkwvvUTXg+OCwRI2mlbLozS6mWeEc10LN+EZWuhEo=; b=bDt5cN6Ao+s58ZQVwfOhIcvKi4q9SSClBtXU454b+GPHIFaFJ5HvhdbjoIBgGgvFjV FHMsNuGq0eSQWsEkXWgui1WeSxB44E1xHmvZB98KW3K09G/wcHJsj1vcl8L7zBAr/g5t 6tAmT2Jr53XTq2sUnzXrZx8CwOCegi8jP0hAlyIvRywHEGtcdRLfANvVudB41u2q5nol +gpIb9/t+eahUPov4At5q0EmlvQOxKB3m6BescfBwv43ndBaPVwGYEpFkK+07ntKC5sA +UKKbRpQDGMS1PNi9Ksa9eVrlIXctRPP75o75RoudyamrpFNziYDwtPK2aFKMokqYRNX TwKA== 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=wvVkwvvUTXg+OCwRI2mlbLozS6mWeEc10LN+EZWuhEo=; b=Ff7gQym2C2llTbfKg0BXb0K3PbMYEvu09CAiFr1B36gl48hh5TAFaw6TVFoF5Nz/VG L4aTmzTqhm1j9n73cCwZKCtfEwqiHVY36Xi/VuBKM147FrHKEjGwpBm9Pke+fPcWDSPm ffL0gyeL6ESIqUiJP8edd7uIP7H2FX+AAPL1Sp9j7kd2Qr+SM1C8DVSxfo1kT3eOkDn4 Z+LUzWC33PYz0Zy5bat3fGaZz6/0bPD8DL3NqA7q7KmCuGQus06jOizXVCcfWW/+AsT6 DV8uTwl3ppj4uUHtLy8xFHgL+EH1Gg/7F7Rhy59BpCkAz/x/7dp9htfgguUmvIECTWZ/ DpwA== X-Gm-Message-State: AMke39m5W1Nk6+ygKJla28lOgWyiFd1bmVSdR2CovO/iCymSBTebwoOQ7t9ENzmwt8hXPQ== X-Received: by 10.223.150.59 with SMTP id b56mr30983043wra.192.1487870682247; Thu, 23 Feb 2017 09:24:42 -0800 (PST) Received: from localhost (port-435.pppoe.wtnet.de. [84.46.1.180]) by smtp.gmail.com with ESMTPSA id 202sm7160296wmp.20.2017.02.23.09.24.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Feb 2017 09:24:41 -0800 (PST) From: Thierry Reding To: "David S . Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Rob Herring , Mark Rutland , Joao Pinto , Alexandre Courbot , Jon Hunter , netdev@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] net: stmmac: Rename clk_ptp_ref clock to ptp_ref Date: Thu, 23 Feb 2017 18:24:32 +0100 Message-Id: <20170223172438.14770-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170223172438.14770-1-thierry.reding@gmail.com> References: <20170223172438.14770-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. Signed-off-by: Thierry Reding --- 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 433a84239a68..5b18355c0d2b 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;