Skip to content

Commit afa9a7b

Browse files
committed
arm64: dts: rockchip: ODROID-N1: re-arrange vop clocks
rk-5.4 797d3756382371464e0bd82c385c22879c4e750f
1 parent f2c3db7 commit afa9a7b

File tree

1 file changed

+56
-12
lines changed

1 file changed

+56
-12
lines changed

arch/arm64/boot/dts/rockchip/rk3399-odroidn1-linux.dts

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,42 @@
512512
cpu-supply = <&vdd_cpu_b>;
513513
};
514514

515+
&display_subsystem {
516+
status = "okay";
517+
518+
ports = <&vopb_out>;
519+
logo-memory-region = <&drm_logo>;
520+
521+
route {
522+
route_hdmi: route-hdmi {
523+
status = "disabled";
524+
logo,uboot = "logo.bmp";
525+
logo,kernel = "logo_kernel.bmp";
526+
logo,mode = "center";
527+
charge_logo,mode = "center";
528+
connect = <&vopb_out_hdmi>;
529+
};
530+
531+
route_dsi: route-dsi {
532+
status = "disabled";
533+
logo,uboot = "logo.bmp";
534+
logo,kernel = "logo_kernel.bmp";
535+
logo,mode = "center";
536+
charge_logo,mode = "center";
537+
connect = <&vopl_out_mipi>;
538+
};
539+
540+
route_edp: route-edp {
541+
status = "disabled";
542+
logo,uboot = "logo.bmp";
543+
logo,kernel = "logo_kernel.bmp";
544+
logo,mode = "center";
545+
charge_logo,mode = "center";
546+
connect = <&vopl_out_edp>;
547+
};
548+
};
549+
};
550+
515551
&dp_in_vopl {
516552
status = "disabled";
517553
};
@@ -843,13 +879,6 @@
843879
ddc-i2c-bus = <&i2c3>;
844880
pinctrl-names = "default";
845881
pinctrl-0 = <&hdmi_cec>;
846-
847-
ports {
848-
/* Don't use vopl for hdmi */
849-
hdmi_in: port {
850-
/delete-node/ endpoint@1;
851-
};
852-
};
853882
};
854883

855884
&io_domains {
@@ -1152,11 +1181,8 @@
11521181
&vopl {
11531182
rockchip,grf = <&grf>;
11541183
status = "okay";
1155-
1156-
/* Don't use vopl for hdmi */
1157-
vopl_out: port {
1158-
/delete-node/ endpoint@2;
1159-
};
1184+
assigned-clocks = <&cru DCLK_VOP1_DIV>;
1185+
assigned-clock-parents = <&cru PLL_VPLL>;
11601186
};
11611187

11621188
&vopl_mmu {
@@ -1166,8 +1192,26 @@
11661192
&vopb {
11671193
rockchip,grf = <&grf>;
11681194
status = "okay";
1195+
assigned-clocks = <&cru DCLK_VOP0_DIV>;
1196+
assigned-clock-parents = <&cru PLL_CPLL>;
11691197
};
11701198

11711199
&vopb_mmu {
11721200
status = "okay";
11731201
};
1202+
1203+
&cdn_dp {
1204+
status = "disabled";
1205+
};
1206+
1207+
&dp_in_vopb {
1208+
status = "disabled";
1209+
};
1210+
1211+
&edp_in_vopb {
1212+
status = "disabled";
1213+
};
1214+
1215+
&hdmi_in_vopl {
1216+
status = "disabled";
1217+
};

0 commit comments

Comments
 (0)