From 4aacfcb8ba6c0b559208d2b47e2533cec807a19e Mon Sep 17 00:00:00 2001 From: Luo Wei Date: Tue, 16 Jan 2024 19:29:25 +0800 Subject: [PATCH 1/4] arm64: dts: rockchip: rk3588-vehicle-evb: move port dts to bridge node for evb20 Signed-off-by: Luo Wei Change-Id: I220a8b1afbc4396219f98652ca27d9595ebbacf8 --- .../rk3588-vehicle-serdes-display-v20.dtsi | 313 +++++++++--------- 1 file changed, 157 insertions(+), 156 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi index c51d5ebe9e90..596d4e76e74f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-serdes-display-v20.dtsi @@ -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>; + }; }; }; }; From 0816368cf2ea6f566868427f345959a880e297e8 Mon Sep 17 00:00:00 2001 From: Cai Wenzhong Date: Thu, 11 Jan 2024 17:30:30 +0800 Subject: [PATCH 2/4] arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max9671(/2)2-d(c)phy0(/3).dtsi: camera module and lens name using default Signed-off-by: Cai Wenzhong Change-Id: I2d24ca79fa856e7280df9d0d3d48a3d998712663 --- ...588-vehicle-evb-maxim-max96712-dcphy0.dtsi | 20 +++++++++---------- ...588-vehicle-evb-maxim-max96712-dcphy1.dtsi | 12 +++++------ ...3588-vehicle-evb-maxim-max96712-dphy0.dtsi | 20 +++++++++---------- ...3588-vehicle-evb-maxim-max96712-dphy3.dtsi | 20 +++++++++---------- ...3588-vehicle-evb-maxim-max96722-dphy0.dtsi | 20 +++++++++---------- ...3588-vehicle-evb-maxim-max96722-dphy3.dtsi | 12 +++++------ 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi index dec3a24159c1..673ff5a9fcbb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy0.dtsi @@ -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 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi index 7d306ead7288..1f3f2ee29ad4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dcphy1.dtsi @@ -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 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi index 4f4dde4e443f..2472a3247ad9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy0.dtsi @@ -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 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi index 6510c3c57ca1..7bd80caaba2d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96712-dphy3.dtsi @@ -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 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi index 55030865daec..908aac609958 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy0.dtsi @@ -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 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi index 1d65ff988091..e4a2da22bb24 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb-maxim-max96722-dphy3.dtsi @@ -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 { From 1eef5bddeacf08cf5068cec91814f74ff0cb7e73 Mon Sep 17 00:00:00 2001 From: Cai Wenzhong Date: Thu, 11 Jan 2024 17:33:27 +0800 Subject: [PATCH 3/4] arm64: dts: rockchip: rk3588-vehicle-maxim-cameras-s66.dtsi: camera module and lens name using default Signed-off-by: Cai Wenzhong Change-Id: If0d997d4f37fb0c39da7179073527dc3a363d73e --- .../rk3588-vehicle-maxim-cameras-s66.dtsi | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi index dd37e7ad78e9..3a45d3339ae4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-maxim-cameras-s66.dtsi @@ -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 { From 334c7192e6a968d1d6272fec5c956ae35a02a3db Mon Sep 17 00:00:00 2001 From: Guochun Huang Date: Fri, 10 Nov 2023 06:17:37 +0000 Subject: [PATCH 4/4] drm/rockchip: drv: display logo when specify force output mode resolve the following error when displaying the boot logo. rockchip-drm display-subsystem: bound fe0a0000.hdmi (ops dw_hdmi_rockchip_ops) rockchip-drm display-subsystem: connector[HDMI-A-1] can't found any match mode [drm] HDMI-A-1 support modes: [drm] "1280x720": 60 74250 1280 1390 1430 1650 720 725 730 750 0x8 0x5 [drm] "4096x2160": 60 556744 4096 4104 4136 4176 2160 2208 2216 2222 0x40 0x9 [drm] "4096x2160": 60 556188 4096 4104 4136 4176 2160 2208 2216 2222 0x40 0x9 [drm] "2560x1600": 60 348500 2560 2752 3032 3504 1600 1603 1609 1658 0x40 0x6 [drm] "2560x1600": 60 268500 2560 2608 2640 2720 1600 1603 1609 1646 0x40 0x9 [drm] "1920x1440": 60 234000 1920 2048 2256 2600 1440 1441 1444 1500 0x40 0x6 [drm] "1856x1392": 60 218250 1856 1952 2176 2528 1392 1393 1396 1439 0x40 0x6 ... [drm] "640x480": 60 25175 640 656 752 800 480 490 492 525 0x40 0xa [drm] uboot set mode: h/v display[1080,1920] h/v sync_end[1180,1940] vfresh[57], flags[0x5], aspect_ratio[0] rockchip-vop2 fe040000.vop: [drm:vop2_crtc_atomic_disable] Crtc atomic disable vp0 rockchip-drm display-subsystem: can't not find any logo display Change-Id: Ia32189311d87f5d5ab5f7fdc5c14d5e2ddf24d8d Signed-off-by: Guochun Huang --- drivers/gpu/drm/rockchip/rockchip_drm_logo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c index af228f40c404..30d84942829b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_logo.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -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);