From: Thierry Reding <thierry.reding@gmail.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Joao Pinto <Joao.Pinto@synopsys.com>,
Jon Hunter <jonathanh@nvidia.com>,
Mikko Perttunen <cyndis@kapsi.fi>,
netdev@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org, Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh+dt@kernel.org>,
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 [thread overview]
Message-ID: <20170310163501.31811-2-thierry.reding@gmail.com> (raw)
In-Reply-To: <20170310163501.31811-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
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 <mark.rutland@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
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;
--
2.12.0
next prev parent reply other threads:[~2017-03-10 16:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-10 16:34 [PATCH v2 0/9] net: stmmac: Fixes and Tegra186 support Thierry Reding
2017-03-10 16:34 ` Thierry Reding [this message]
2017-03-20 15:18 ` [PATCH v2 1/9] net: stmmac: Rename clk_ptp_ref clock to ptp_ref Rob Herring
2017-03-10 16:34 ` [PATCH v2 2/9] net: stmmac: Stop PHY and remove TX timer on error Thierry Reding
2017-03-10 16:34 ` [PATCH v2 3/9] net: stmmac: Disable PTP reference clock " Thierry Reding
2017-03-10 16:34 ` [PATCH v2 4/9] net: stmmac: Balance PTP reference clock enable/disable Thierry Reding
2017-03-10 16:34 ` [PATCH v2 5/9] net: stmmac: Check for DMA mapping errors Thierry Reding
2017-03-10 16:34 ` [PATCH v2 6/9] net: stmmac: Parse FIFO sizes from feature registers Thierry Reding
2017-03-10 16:34 ` [PATCH v2 7/9] net: stmmac: Program RX queue size and flow control Thierry Reding
2017-03-10 16:35 ` [PATCH v2 8/9] net: stmmac: dwc-qos: Split out ->probe() and ->remove() Thierry Reding
2017-03-10 16:35 ` [PATCH v2 9/9] net: stmmac: dwc-qos: Add Tegra186 support Thierry Reding
2017-03-13 6:35 ` [PATCH v2 0/9] net: stmmac: Fixes and " David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170310163501.31811-2-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=Joao.Pinto@synopsys.com \
--cc=alexandre.torgue@st.com \
--cc=cyndis@kapsi.fi \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®