lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 394/667] ARM: dts: ci4x10: Adapt to changes in imx6qdl.dtsi regarding fec clocks
    Date
    From: Thorsten Scherer <t.scherer@eckelmann.de>

    [ Upstream commit 3d397a1277853498e8b7b305f2610881357c033f ]

    Commit f3e7dae323ab ("ARM: dts: imx6qdl: add enet_out clk
    support") added another item to the list of clocks for the fec
    device. As imx6dl-eckelmann-ci4x10.dts only overwrites clocks,
    but not clock-names this resulted in an inconsistency with
    clocks having one item more than clock-names.

    Also overwrite clock-names with the same value as in
    imx6qdl.dtsi. This is a no-op today, but prevents similar
    inconsistencies if the soc file will be changed in a similar way
    in the future.

    Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
    Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Fixes: f3e7dae323ab ("ARM: dts: imx6qdl: add enet_out clk support")
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts b/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts
    index b4a9523e325b..864dc5018451 100644
    --- a/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts
    +++ b/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts
    @@ -297,7 +297,11 @@
    phy-mode = "rmii";
    phy-reset-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
    phy-handle = <&phy>;
    - clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>;
    + clocks = <&clks IMX6QDL_CLK_ENET>,
    + <&clks IMX6QDL_CLK_ENET>,
    + <&rmii_clk>,
    + <&clks IMX6QDL_CLK_ENET_REF>;
    + clock-names = "ipg", "ahb", "ptp", "enet_out";
    status = "okay";

    mdio {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 21:32    [W:4.443 / U:0.784 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site