shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '334c7192e6a968d1d6272fec5c956ae35a02a3db'

Browse Source 
* commit '334c7192e6a968d1d6272fec5c956ae35a02a3db':
  drm/rockchip: drv: display logo when specify force output mode
  arm64: dts: rockchip: rk3588-vehicle-maxim-cameras-s66.dtsi: camera module and lens name using default
  arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max9671(/2)2-d(c)phy0(/3).dtsi: camera module and lens name using default
  arm64: dts: rockchip: rk3588-vehicle-evb: move port dts to bridge node for evb20

Change-Id: I13e8ae92a8f8f9143e2ac5c0cc86b07770354a8d
This commit is contained in:
Tao Huang
2024-01-19 20:52:25 +08:00
parent 711520711d 334c7192e6
commit 048df626ea
9 changed files with 226 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi
View File

@@ -114,8 +114,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "max96712";
rockchip,camera-module-lens-name = "max96712";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
max96712_dcphy0_out: endpoint {
@@ -509,8 +509,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -580,8 +580,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -651,8 +651,8 @@
rockchip,camera-module-index = <2>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -722,8 +722,8 @@
rockchip,camera-module-index = <3>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {

12
arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi
View File

@@ -114,8 +114,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "max96712";
rockchip,camera-module-lens-name = "max96712";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
max96712_dcphy1_out: endpoint {
@@ -389,8 +389,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ov2311";
rockchip,camera-module-lens-name = "ov2311";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -454,8 +454,8 @@
rockchip,camera-module-index = <1>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ov2312";
rockchip,camera-module-lens-name = "ov2312";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {

20
arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi
View File

@@ -114,8 +114,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "max96712";
rockchip,camera-module-lens-name = "max96712";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
max96712_dphy0_out: endpoint {
@@ -521,8 +521,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -592,8 +592,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -663,8 +663,8 @@
rockchip,camera-module-index = <2>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -734,8 +734,8 @@
rockchip,camera-module-index = <3>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {

20
arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi
View File

@@ -114,8 +114,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "max96712";
rockchip,camera-module-lens-name = "max96712";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
max96712_dphy3_out: endpoint {
@@ -464,8 +464,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "sc320at";
rockchip,camera-module-lens-name = "sc320at";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -518,8 +518,8 @@
rockchip,camera-module-index = <1>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "sc320at";
rockchip,camera-module-lens-name = "sc320at";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -571,8 +571,8 @@
rockchip,camera-module-index = <2>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "sc320at";
rockchip,camera-module-lens-name = "sc320at";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -624,8 +624,8 @@
rockchip,camera-module-index = <3>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "sc320at";
rockchip,camera-module-lens-name = "sc320at";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {

20
arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi
View File

@@ -114,8 +114,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "max96722";
rockchip,camera-module-lens-name = "max96722";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
max96722_dphy0_out: endpoint {
@@ -521,8 +521,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -592,8 +592,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -663,8 +663,8 @@
rockchip,camera-module-index = <2>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -734,8 +734,8 @@
rockchip,camera-module-index = <3>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {

12
arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi
View File

@@ -114,8 +114,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "max96722";
rockchip,camera-module-lens-name = "max96722";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
max96722_dphy3_out: endpoint {
@@ -401,8 +401,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ov2311";
rockchip,camera-module-lens-name = "ov2311";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -466,8 +466,8 @@
rockchip,camera-module-index = <1>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ov2312";
rockchip,camera-module-lens-name = "ov2312";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {

32
arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi
View File

@@ -293,8 +293,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "max96712";
rockchip,camera-module-lens-name = "max96712";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
max96712_dphy0_out: endpoint {
@@ -700,8 +700,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -771,8 +771,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -842,8 +842,8 @@
rockchip,camera-module-index = <2>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -913,8 +913,8 @@
rockchip,camera-module-index = <3>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ox01f10";
rockchip,camera-module-lens-name = "ox01f10";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -949,8 +949,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "max96722";
rockchip,camera-module-lens-name = "max96722";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
port {
max96722_dphy3_out: endpoint {
@@ -1236,8 +1236,8 @@
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ov2311";
rockchip,camera-module-lens-name = "ov2311";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {
@@ -1301,8 +1301,8 @@
rockchip,camera-module-index = <1>;
rockchip,camera-module-facing = "back";
rockchip,camera-module-name = "ov2312";
rockchip,camera-module-lens-name = "ov2312";
rockchip,camera-module-name = "default";
rockchip,camera-module-lens-name = "default";
/* port config start */
port {

313
arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi
View File

@@ -762,25 +762,25 @@
i2c2_bu18tl82_bridge: i2c2-bu18tl82-bridge {
compatible = "rohm,bu18tl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c2_bu18tl82_in_dsi0: endpoint {
remote-endpoint = <&dsi0_out_i2c2_bu18tl82>;
i2c2_bu18tl82_in_dsi0: endpoint {
remote-endpoint = <&dsi0_out_i2c2_bu18tl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c2_bu18tl82_out_i2c2_bu18rl82: endpoint {
remote-endpoint = <&i2c2_bu18rl82_in_i2c2_bu18tl82>;
i2c2_bu18tl82_out_i2c2_bu18rl82: endpoint {
remote-endpoint = <&i2c2_bu18rl82_in_i2c2_bu18tl82>;
};
};
};
};
@@ -926,25 +926,25 @@
i2c2_bu18rl82_bridge: i2c2-bu18rl82-bridge {
compatible = "rohm,bu18rl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c2_bu18rl82_in_i2c2_bu18tl82: endpoint {
remote-endpoint = <&i2c2_bu18tl82_out_i2c2_bu18rl82>;
i2c2_bu18rl82_in_i2c2_bu18tl82: endpoint {
remote-endpoint = <&i2c2_bu18tl82_out_i2c2_bu18rl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c2_bu18rl82_out_panel0: endpoint {
remote-endpoint = <&panel0_in_i2c2_bu18rl82>;
i2c2_bu18rl82_out_panel0: endpoint {
remote-endpoint = <&panel0_in_i2c2_bu18rl82>;
};
};
};
};
@@ -1065,25 +1065,25 @@
i2c4_bu18tl82_bridge: i2c4-bu18tl82-bridge {
compatible = "rohm,bu18tl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c4_bu18tl82_in_dp0: endpoint {
remote-endpoint = <&dp0_out_i2c4_bu18tl82>;
i2c4_bu18tl82_in_dp0: endpoint {
remote-endpoint = <&dp0_out_i2c4_bu18tl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c4_bu18tl82_out_i2c4_bu18rl82: endpoint {
remote-endpoint = <&i2c4_bu18rl82_in_i2c4_bu18tl82>;
i2c4_bu18tl82_out_i2c4_bu18rl82: endpoint {
remote-endpoint = <&i2c4_bu18rl82_in_i2c4_bu18tl82>;
};
};
};
};
@@ -1224,25 +1224,25 @@
i2c4_bu18rl82_bridge: i2c4-bu18rl82-bridge {
compatible = "rohm,bu18rl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c4_bu18rl82_in_i2c4_bu18tl82: endpoint {
remote-endpoint = <&i2c4_bu18tl82_out_i2c4_bu18rl82>;
i2c4_bu18rl82_in_i2c4_bu18tl82: endpoint {
remote-endpoint = <&i2c4_bu18tl82_out_i2c4_bu18rl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c4_bu18rl82_out_panel0: endpoint {
remote-endpoint = <&panel0_in_i2c4_bu18rl82>;
i2c4_bu18rl82_out_panel0: endpoint {
remote-endpoint = <&panel0_in_i2c4_bu18rl82>;
};
};
};
};
@@ -1371,25 +1371,25 @@
i2c5_bu18tl82_bridge: i2c5-bu18tl82-bridge {
compatible = "rohm,bu18tl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c5_bu18tl82_in_edp0: endpoint {
remote-endpoint = <&edp0_out_i2c5_bu18tl82>;
i2c5_bu18tl82_in_edp0: endpoint {
remote-endpoint = <&edp0_out_i2c5_bu18tl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c5_bu18tl82_out_i2c5_bu18rl82: endpoint {
remote-endpoint = <&i2c5_bu18rl82_in_i2c5_bu18tl82>;
i2c5_bu18tl82_out_i2c5_bu18rl82: endpoint {
remote-endpoint = <&i2c5_bu18rl82_in_i2c5_bu18tl82>;
};
};
};
};
@@ -1533,25 +1533,25 @@
i2c5_bu18rl82_bridge: i2c5-bu18rl82-bridge {
compatible = "rohm,bu18rl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c5_bu18rl82_in_i2c5_bu18tl82: endpoint {
remote-endpoint = <&i2c5_bu18tl82_out_i2c5_bu18rl82>;
i2c5_bu18rl82_in_i2c5_bu18tl82: endpoint {
remote-endpoint = <&i2c5_bu18tl82_out_i2c5_bu18rl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c5_bu18rl82_out_panel0: endpoint {
remote-endpoint = <&panel0_in_i2c5_bu18rl82>;
i2c5_bu18rl82_out_panel0: endpoint {
remote-endpoint = <&panel0_in_i2c5_bu18rl82>;
};
};
};
};
@@ -1706,25 +1706,25 @@
i2c6_bu18tl82_bridge: i2c6-bu18tl82-bridge {
compatible = "rohm,bu18tl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c6_bu18tl82_in_dsi1: endpoint {
remote-endpoint = <&dsi1_out_i2c6_bu18tl82>;
i2c6_bu18tl82_in_dsi1: endpoint {
remote-endpoint = <&dsi1_out_i2c6_bu18tl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c6_bu18tl82_out_i2c6_bu18rl82: endpoint {
remote-endpoint = <&i2c6_bu18rl82_in_i2c6_bu18tl82>;
i2c6_bu18tl82_out_i2c6_bu18rl82: endpoint {
remote-endpoint = <&i2c6_bu18rl82_in_i2c6_bu18tl82>;
};
};
};
};
@@ -1872,25 +1872,25 @@
i2c6_bu18rl82_bridge: i2c6-bu18rl82-bridge {
compatible = "rohm,bu18rl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c6_bu18rl82_in_i2c6_bu18tl82: endpoint {
remote-endpoint = <&i2c6_bu18tl82_out_i2c6_bu18rl82>;
i2c6_bu18rl82_in_i2c6_bu18tl82: endpoint {
remote-endpoint = <&i2c6_bu18tl82_out_i2c6_bu18rl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c6_bu18rl82_out_panel1: endpoint {
remote-endpoint = <&panel1_in_i2c6_bu18rl82>;
i2c6_bu18rl82_out_panel1: endpoint {
remote-endpoint = <&panel1_in_i2c6_bu18rl82>;
};
};
};
};
@@ -2010,24 +2010,25 @@
i2c7_bu18tl82_bridge: i2c7-bu18tl82-bridge {
compatible = "rohm,bu18tl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
i2c7_bu18tl82_in_edp1: endpoint {
remote-endpoint = <&edp1_out_i2c7_bu18tl82>;
port@0 {
reg = <0>;
i2c7_bu18tl82_in_edp1: endpoint {
remote-endpoint = <&edp1_out_i2c7_bu18tl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c7_bu18tl82_out_i2c7_bu18rl82: endpoint {
remote-endpoint = <&i2c7_bu18rl82_in_i2c7_bu18tl82>;
i2c7_bu18tl82_out_i2c7_bu18rl82: endpoint {
remote-endpoint = <&i2c7_bu18rl82_in_i2c7_bu18tl82>;
};
};
};
};
@@ -2144,25 +2145,25 @@
i2c7_bu18rl82_bridge: i2c7-bu18rl82-bridge {
compatible = "rohm,bu18rl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c7_bu18rl82_in_i2c7_bu18tl82: endpoint {
remote-endpoint = <&i2c7_bu18tl82_out_i2c7_bu18rl82>;
i2c7_bu18rl82_in_i2c7_bu18tl82: endpoint {
remote-endpoint = <&i2c7_bu18tl82_out_i2c7_bu18rl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c7_bu18rl82_out_panel1: endpoint {
remote-endpoint = <&panel1_in_i2c7_bu18rl82>;
i2c7_bu18rl82_out_panel1: endpoint {
remote-endpoint = <&panel1_in_i2c7_bu18rl82>;
};
};
};
};
@@ -2289,25 +2290,25 @@
i2c8_bu18tl82_bridge: i2c8-bu18tl82-bridge {
compatible = "rohm,bu18tl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c8_bu18tl82_in_dp1: endpoint {
remote-endpoint = <&dp1_out_i2c8_bu18tl82>;
i2c8_bu18tl82_in_dp1: endpoint {
remote-endpoint = <&dp1_out_i2c8_bu18tl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c8_bu18tl82_out_i2c8_bu18rl82: endpoint {
remote-endpoint = <&i2c8_bu18rl82_in_i2c8_bu18tl82>;
i2c8_bu18tl82_out_i2c8_bu18rl82: endpoint {
remote-endpoint = <&i2c8_bu18rl82_in_i2c8_bu18tl82>;
};
};
};
};
@@ -2424,25 +2425,25 @@
i2c8_bu18rl82_bridge: i2c8-bu18rl82-bridge {
compatible = "rohm,bu18rl82-bridge";
status = "okay";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
port@0 {
reg = <0>;
i2c8_bu18rl82_in_i2c8_bu18tl82: endpoint {
remote-endpoint = <&i2c8_bu18tl82_out_i2c8_bu18rl82>;
i2c8_bu18rl82_in_i2c8_bu18tl82: endpoint {
remote-endpoint = <&i2c8_bu18tl82_out_i2c8_bu18rl82>;
};
};
};
port@1 {
reg = <1>;
port@1 {
reg = <1>;
i2c8_bu18rl82_out_panel1: endpoint {
remote-endpoint = <&panel1_in_i2c8_bu18rl82>;
i2c8_bu18rl82_out_panel1: endpoint {
remote-endpoint = <&panel1_in_i2c8_bu18rl82>;
};
};
};
};

3
drivers/gpu/drm/rockchip/rockchip_drm_logo.c
View File

@@ -630,8 +630,7 @@ static int rockchip_drm_fill_connector_modes(struct drm_connector *connector,
goto prune;
}
if (!force_output)
count = (*connector_funcs->get_modes)(connector);
count = (*connector_funcs->get_modes)(connector);
if (count == 0 && connector->status == connector_status_connected)
count = drm_add_modes_noedid(connector, 4096, 4096);