| Message ID | 20200425122345.12902-1-jbx6244@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f73a28284e2a89a7ca1e10e04514aedd33290c76 |
| Headers | show |
| Series | [1/2] arm64: dts: rockchip: remove extra assigned-clocks property from &gmac2phy node in rk3328-evb.dts | expand |
On Sat, 25 Apr 2020 14:23:44 +0200, Johan Jonker wrote: > There are 2 'assigned-clocks' properties in the '&gmac2phy' > node in 'rk3328-evb.dts', so remove one of them. > > Info from clk-rk3328.c: > > MUXGRF(SCLK_MAC2PHY, "clk_mac2phy", mux_mac2phy_src_p, > CLK_SET_RATE_NO_REPARENT, > RK3328_GRF_MAC_CON2, 10, 1, MFLAGS), > > [...] Applied, thanks! [1/2] arm64: dts: rockchip: remove extra assigned-clocks property from &gmac2phy node in rk3328-evb.dts commit: f73a28284e2a89a7ca1e10e04514aedd33290c76 [2/2] arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts commit: c617ed88502d0b05149e7f32f3b3fd8a0663f7e2 Best regards,
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts index 49c4b96da..ab69b493d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-evb.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-evb.dts @@ -82,7 +82,6 @@ &gmac2phy { phy-supply = <&vcc_phy>; clock_in_out = "output"; - assigned-clocks = <&cru SCLK_MAC2PHY_SRC>; assigned-clock-rate = <50000000>; assigned-clocks = <&cru SCLK_MAC2PHY>; assigned-clock-parents = <&cru SCLK_MAC2PHY_SRC>;
There are 2 'assigned-clocks' properties in the '&gmac2phy' node in 'rk3328-evb.dts', so remove one of them. Info from clk-rk3328.c: MUXGRF(SCLK_MAC2PHY, "clk_mac2phy", mux_mac2phy_src_p, CLK_SET_RATE_NO_REPARENT, RK3328_GRF_MAC_CON2, 10, 1, MFLAGS), Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 1 - 1 file changed, 1 deletion(-)