Skip to content

Commit b2b7438

Browse files
bivvyrkhuangtao
authored andcommitted
ARM64: dts: rockchip: rename mipi to dsi for rk3368
Change-Id: Ied02b4d521ad3c49ce7b7a591a3d3f8544182e12 Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
1 parent bae7eaa commit b2b7438

4 files changed

Lines changed: 16 additions & 14 deletions

File tree

arch/arm64/boot/dts/rockchip/rk3368-android.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@
141141

142142
memory-region = <&drm_logo>;
143143
route {
144-
route_mipi: route-mipi {
144+
route_dsi: route-dsi {
145145
status = "disabled";
146146
logo,uboot = "logo.bmp";
147147
logo,kernel = "logo_kernel.bmp";
148148
logo,mode = "center";
149149
charge_logo,mode = "center";
150-
connect = <&vop_out_mipi>;
150+
connect = <&vop_out_dsi>;
151151
};
152152

153153
route_edp: route-edp {

arch/arm64/boot/dts/rockchip/rk3368-p9.dts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -674,22 +674,23 @@
674674
status = "okay";
675675
};
676676

677-
&mipi_dsi_host {
677+
&dsi {
678678
status = "okay";
679679

680680
dsi_panel: panel@0 {
681681
compatible = "simple-panel-dsi";
682682
reg = <0>;
683683
backlight = <&backlight>;
684684
enable-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
685+
685686
dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST)>;
686687
dsi,format = <MIPI_DSI_FMT_RGB888>;
687688
dsi,lanes = <4>;
688689

689690
delay,prepare = <120>;
690691
delay,enable = <200>;
691692

692-
disp_timings: display-timings {
693+
display-timings {
693694
native-mode = <&timing0>;
694695

695696
timing0: timing0 {
@@ -715,7 +716,7 @@
715716
status = "okay";
716717
};
717718

718-
&route_mipi {
719+
&route_dsi {
719720
status = "okay";
720721
};
721722

arch/arm64/boot/dts/rockchip/rk3368-sheep.dts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -585,21 +585,22 @@
585585
status = "okay";
586586
};
587587

588-
&mipi_dsi_host {
588+
&dsi {
589589
status = "okay";
590590

591591
dsi_panel: panel@0 {
592592
compatible = "simple-panel-dsi";
593593
reg = <0>;
594594
backlight = <&backlight>;
595595
enable-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
596+
596597
dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST)>;
597598
dsi,format = <MIPI_DSI_FMT_RGB888>;
598599
dsi,lanes = <4>;
600+
599601
delay,prepare = <120>;
600-
status = "okay";
601602

602-
disp_timings: display-timings {
603+
display-timings {
603604
native-mode = <&timing0>;
604605

605606
timing0: timing0 {
@@ -626,7 +627,7 @@
626627
status = "okay";
627628
};
628629

629-
&route_mipi {
630+
&route_dsi {
630631
status = "okay";
631632
};
632633

arch/arm64/boot/dts/rockchip/rk3368.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,9 +1381,9 @@
13811381
#address-cells = <1>;
13821382
#size-cells = <0>;
13831383

1384-
vop_out_mipi: endpoint@0 {
1384+
vop_out_dsi: endpoint@0 {
13851385
reg = <0>;
1386-
remote-endpoint = <&mipi_in_vop>;
1386+
remote-endpoint = <&dsi_in_vop>;
13871387
};
13881388

13891389
vop_out_edp: endpoint@1 {
@@ -1421,7 +1421,7 @@
14211421
status = "disabled";
14221422
};
14231423

1424-
mipi_dsi_host: mipi-dsi-host@ff960000 {
1424+
dsi: dsi@ff960000 {
14251425
compatible = "rockchip,rk3368-mipi-dsi";
14261426
reg = <0x0 0xff960000 0x0 0x4000>;
14271427
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1439,8 +1439,8 @@
14391439

14401440
ports {
14411441
port {
1442-
mipi_in_vop: endpoint {
1443-
remote-endpoint = <&vop_out_mipi>;
1442+
dsi_in_vop: endpoint {
1443+
remote-endpoint = <&vop_out_dsi>;
14441444
};
14451445
};
14461446
};

0 commit comments

Comments
 (0)