lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/9] net: stmmac: Rename clk_ptp_ref clock to ptp_ref
    Date
    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
    \
     
     \ /
      Last update: 2017-03-10 17:38    [W:3.164 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site