Skip to content

Commit abaf16c

Browse files
bivvyrkhuangtao
authored andcommitted
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 <bivvy.bi@rock-chips.com>
1 parent d019093 commit abaf16c

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

arch/arm/boot/dts/rk3288-evb-rk628-hdmi2dsi-avb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
status = "disabled";
383383
};
384384

385-
&xin_osc0_func {
385+
&rk628_xin_osc0_func {
386386
compatible = "fixed-factor-clock";
387387
clocks = <&cru SCLK_TESTOUT>;
388388
clock-mult = <1>;

arch/arm/boot/dts/rk3288-evb-rk628-hdmi2gvi-avb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
status = "disabled";
223223
};
224224

225-
&xin_osc0_func {
225+
&rk628_xin_osc0_func {
226226
compatible = "fixed-factor-clock";
227227
clocks = <&cru SCLK_TESTOUT>;
228228
clock-mult = <1>;

arch/arm/boot/dts/rk3288-evb-rk628-rgb2hdmi-avb.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
status = "okay";
4040
};
4141

42-
&xin_osc0_func {
42+
&rk628_xin_osc0_func {
4343
compatible = "fixed-factor-clock";
4444
clocks = <&cru SCLK_TESTOUT>;
4545
clock-mult = <1>;

arch/arm/boot/dts/rk628.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
#include <dt-bindings/clock/rk628-cgu.h>
66

77
/ {
8-
xin_osc0_func: xin-osc0-func {
8+
rk628_xin_osc0_func: rk628-xin-osc0-func {
99
compatible = "fixed-clock";
1010
#clock-cells = <0>;
1111
clock-frequency = <24000000>;
12-
clock-output-names = "xin_osc0_func";
12+
clock-output-names = "rk628_xin_osc0_func";
1313
};
1414

15-
xin_osc0_half: xin-osc0-half {
15+
rk628_xin_osc0_half: rk628-xin-osc0-half {
1616
compatible = "fixed-factor-clock";
1717
#clock-cells = <0>;
18-
clocks = <&xin_osc0_func>;
18+
clocks = <&rk628_xin_osc0_func>;
1919
clock-mult = <1>;
2020
clock-div = <2>;
21-
clock-output-names = "xin_osc0_half";
21+
clock-output-names = "rk628_xin_osc0_half";
2222
};
2323
};
2424

0 commit comments

Comments
 (0)