Skip to content

Commit bae7eaa

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

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
4040
* OTHER DEALINGS IN THE SOFTWARE.
4141
*/
42-
#include <dt-bindings/display/drm_mipi_dsi.h>
43-
#include <dt-bindings/display/media-bus-format.h>
4442

4543
/ {
4644
compatible = "rockchip,android", "rockchip,rk3366";
@@ -63,12 +61,12 @@
6361
memory-region = <&drm_logo>;
6462

6563
route {
66-
route_mipi: route-mipi {
64+
route_dsi: route-dsi {
6765
logo,uboot = "logo.bmp";
6866
logo,kernel = "logo_kernel.bmp";
6967
logo,mode = "center";
7068
charge_logo,mode = "center";
71-
connect = <&vopb_out_mipi>;
69+
connect = <&vopb_out_dsi>;
7270
status = "disabled";
7371
};
7472

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,11 +738,11 @@
738738
status = "okay";
739739
};
740740

741-
&route_mipi {
741+
&route_dsi {
742742
status = "okay";
743743
};
744744

745-
&video_phy {
745+
&mipi_dphy {
746746
status = "okay";
747747
rockchip,dsi-panel = <&panel>;
748748
};

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -939,9 +939,9 @@
939939
#address-cells = <1>;
940940
#size-cells = <0>;
941941

942-
vopb_out_mipi: endpoint@0 {
942+
vopb_out_dsi: endpoint@0 {
943943
reg = <0>;
944-
remote-endpoint = <&mipi_in_vopb>;
944+
remote-endpoint = <&dsi_in_vopb>;
945945
};
946946

947947
vopb_out_lvds: endpoint@1 {
@@ -959,7 +959,7 @@
959959
clock-names = "pclk";
960960
resets = <&cru SRST_MIPIDSI0>;
961961
reset-names = "apb";
962-
phys = <&video_phy>;
962+
phys = <&mipi_dphy>;
963963
phy-names = "mipi_dphy";
964964
//power-domains = <&power RK3366_PD_VIO>;
965965
rockchip,grf = <&grf>;
@@ -972,15 +972,15 @@
972972
#address-cells = <1>;
973973
#size-cells = <0>;
974974

975-
mipi_in_vopb: endpoint@0 {
975+
dsi_in_vopb: endpoint@0 {
976976
reg = <0>;
977-
remote-endpoint = <&vopb_out_mipi>;
977+
remote-endpoint = <&vopb_out_dsi>;
978978
};
979979
};
980980
};
981981
};
982982

983-
video_phy: video-phy@ff968000 {
983+
mipi_dphy: mipi-dphy@ff968000 {
984984
compatible = "rockchip,rk3366-mipi-dphy";
985985
reg = <0x0 0xff968000 0x0 0x4000>;
986986
clocks = <&cru SCLK_MIPIDSI_24M>, <&cru PCLK_DPHYTX>;

0 commit comments

Comments
 (0)