From ed85b3c40168c2fb8df70df295ef5da057c1c62b Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Thu, 15 Apr 2021 15:36:50 +0800 Subject: [PATCH] ARM: dts: rockchip: rk628: Avoid namespace conflicts Add a prefix for all clocks to avoid namespace conflicts, and no functional changes. Change-Id: I1cf1c868f84b9bee4ba033bdd80c4995876b43f1 Signed-off-by: Wyon Bi --- arch/arm/boot/dts/rk628.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/rk628.dtsi b/arch/arm/boot/dts/rk628.dtsi index 5fc4a552b9ca..39b9af6f39dd 100644 --- a/arch/arm/boot/dts/rk628.dtsi +++ b/arch/arm/boot/dts/rk628.dtsi @@ -5,20 +5,20 @@ #include / { - xin_osc0_func: xin-osc0-func { + rk628_xin_osc0_func: rk628-xin-osc0-func { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <24000000>; - clock-output-names = "xin_osc0_func"; + clock-output-names = "rk628_xin_osc0_func"; }; - xin_osc0_half: xin-osc0-half { + rk628_xin_osc0_half: rk628-xin-osc0-half { compatible = "fixed-factor-clock"; #clock-cells = <0>; - clocks = <&xin_osc0_func>; + clocks = <&rk628_xin_osc0_func>; clock-mult = <1>; clock-div = <2>; - clock-output-names = "xin_osc0_half"; + clock-output-names = "rk628_xin_osc0_half"; }; };