From 440be3e956dd20d96c3dc65222820f8fb0daa3bf Mon Sep 17 00:00:00 2001 From: zhangpeng Date: Thu, 6 Nov 2025 14:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9dcphy=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rk3588/.dr4-rk3588.dtb.dts.tmp | 131 +++++++++++++++++---------------- rk3588/dr4-rk3588.dtb | Bin 265298 -> 265315 bytes rk3588/zkzg_mipi.dtsi | 130 +++++++++++--------------------- 3 files changed, 113 insertions(+), 148 deletions(-) diff --git a/rk3588/.dr4-rk3588.dtb.dts.tmp b/rk3588/.dr4-rk3588.dtb.dts.tmp index 24b3344..ef83e2e 100644 --- a/rk3588/.dr4-rk3588.dtb.dts.tmp +++ b/rk3588/.dr4-rk3588.dtb.dts.tmp @@ -14551,17 +14551,51 @@ # 1 "arch/arm64/boot/dts/rockchip/rk3588/zkzg_mipi.dtsi" 1 + + + + +&csi2_dcphy0 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + mipidcphy0_in_ucam0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mvcam_out4>; + data-lanes = <1 2 3 4>; + }; + }; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + csidcphy0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&mipi0_csi2_input>; + }; + }; + }; +}; + &i2c7 { status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&i2c7m0_xfer>; - - mvcam: mvcam@1a { - compatible = "veye,mvcam"; + mvcam_4: mvcam@3b{ status = "okay"; - reg = <0x3b>; - clocks = <&cru 256>; + compatible = "veye,mvcam"; + reg = <0x3b>; + clocks = <&cru 257>; clock-names = "xvclk"; power-domains = <&power 27>; pinctrl-names = "default"; @@ -14569,112 +14603,85 @@ rockchip,grf = <&sys_grf>; reset-gpios = <&gpio1 3 0>; pwdn-gpios = <&gpio1 5 0>; - rockchip,camera-module-index = <2>; - rockchip,camera-module-facing = "front"; - rockchip,camera-module-name = "CMK-OT2022-PX1"; - rockchip,camera-module-lens-name = "IR0147-50IRC-8M-F20"; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "NC"; + rockchip,camera-module-lens-name = "NC"; port { - mvcam_out0: endpoint { - remote-endpoint = <&mipi_in_ucam2>; + mvcam_out4: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; data-lanes = <1 2 3 4>; }; }; }; + }; -&csi2_dphy0_hw { +&mipi_dcphy0 { status = "okay"; }; -&csi2_dphy0 { +&mipi0_csi2 { status = "okay"; + ports { #address-cells = <1>; #size-cells = <0>; + port@0 { reg = <0>; #address-cells = <1>; #size-cells = <0>; - mipi_in_ucam2: endpoint@1 { + + mipi0_csi2_input: endpoint@1 { reg = <1>; - remote-endpoint = <&mvcam_out0>; - data-lanes = <1 2 3 4>; + remote-endpoint = <&csidcphy0_out>; }; }; + port@1 { reg = <1>; #address-cells = <1>; #size-cells = <0>; - csidphy0_out: endpoint@0 { + + mipi0_csi2_output: endpoint@0 { reg = <0>; - remote-endpoint = <&mipi2_csi2_input>; + remote-endpoint = <&cif_mipi_in0>; }; }; }; }; -&mipi2_csi2 { +&rkcif_mipi_lvds { status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - mipi2_csi2_input: endpoint@1 { - reg = <1>; - remote-endpoint = <&csidphy0_out>; - }; - }; - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - mipi2_csi2_output: endpoint@0 { - reg = <0>; - remote-endpoint = <&cif_mipi_in2>; - }; - }; - }; -}; - -&rkcif_mipi_lvds2 { - status = "okay"; port { - cif_mipi_in2: endpoint { - remote-endpoint = <&mipi2_csi2_output>; + cif_mipi_in0: endpoint { + remote-endpoint = <&mipi0_csi2_output>; }; }; }; -&rkcif_mipi_lvds2_sditf { - status = "okay"; +&rkcif_mipi_lvds_sditf { + status = "disabled"; + port { - mipi2_lvds_sditf: endpoint { - remote-endpoint = <&isp1_vir1>; + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_in1>; }; }; }; -&rkisp1 { - status = "okay"; -}; +&rkisp1_vir0 { + status = "disabled"; -&isp1_mmu { - status = "okay"; -}; - -&rkisp1_vir1 { - status = "okay"; port { #address-cells = <1>; #size-cells = <0>; - isp1_vir1: endpoint@0 { + isp1_in1: endpoint@0 { reg = <0>; - remote-endpoint = <&mipi2_lvds_sditf>; + remote-endpoint = <&mipi_lvds_sditf>; }; }; }; diff --git a/rk3588/dr4-rk3588.dtb b/rk3588/dr4-rk3588.dtb index 42016d67248507e949bdf04a86acd3725dac3c2b..494563ce8af0484dfabefe47d8c22b2337c3d14a 100644 GIT binary patch delta 12347 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 delta 12489 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 diff --git a/rk3588/zkzg_mipi.dtsi b/rk3588/zkzg_mipi.dtsi index a5733d4..0e3295e 100644 --- a/rk3588/zkzg_mipi.dtsi +++ b/rk3588/zkzg_mipi.dtsi @@ -1,21 +1,9 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (c) 2022 www.veye.cc + * Copyright (c) 2021 Rockchip Electronics Co., Ltd. * */ -/ { - vcc_mipidcphy0: vcc-mipidcphy0-regulator { - status = "disabled"; - compatible = "regulator-fixed"; - gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&mipidcphy0_pwr>; - regulator-name = "vcc_mipidcphy0"; - enable-active-high; - }; -}; - &csi2_dcphy0 { status = "okay"; @@ -27,12 +15,13 @@ #address-cells = <1>; #size-cells = <0>; - mipidcphy0_in_ucam0: endpoint@1 { - reg = <1>; - remote-endpoint = <&mvcam_out0>; + mipidcphy0_in_ucam0: endpoint@0 { + reg = <0>; + remote-endpoint = <&mvcam_out4>; data-lanes = <1 2 3 4>; }; }; + port@1 { reg = <1>; #address-cells = <1>; @@ -46,42 +35,39 @@ }; }; -&csi2_dcphy0_hw { +&i2c7 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c7m0_xfer>; + + mvcam_4: mvcam@3b{ + status = "okay"; + compatible = "veye,mvcam"; + reg = <0x3b>; + clocks = <&cru CLK_MIPI_CAMARAOUT_M2>; + clock-names = "xvclk"; + power-domains = <&power RK3588_PD_VI>; + pinctrl-names = "default"; + pinctrl-0 = <&mipim0_camera2_clk>; + rockchip,grf = <&sys_grf>; + reset-gpios = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; + pwdn-gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_HIGH>; + rockchip,camera-module-index = <0>; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "NC"; + rockchip,camera-module-lens-name = "NC"; + port { + mvcam_out4: endpoint { + remote-endpoint = <&mipidcphy0_in_ucam0>; + data-lanes = <1 2 3 4>; + }; + }; + }; + }; -&i2c7 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c7m0_xfer>; - - mvcam: mvcam@3b{ - compatible = "veye,mvcam"; - reg = <0x3b>; - clocks = <&cru CLK_MIPI_CAMARAOUT_M2>; - clock-names = "xvclk"; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera2_clk>; - power-domains = <&power RK3588_PD_VI>; - - //power-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_LOW>; - reset-gpios = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; - pwdn-gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_HIGH>; - - //avdd-supply = <&vcc_mipidcphy0>; - //firefly,clkout-enabled-index = <0>; - rockchip,camera-module-index = <0>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "NC"; - rockchip,camera-module-lens-name = "NC"; - port { - mvcam_out0: endpoint { - remote-endpoint = <&mipidcphy0_in_ucam0>; - data-lanes = <1 2 3 4>; - }; - }; - }; - +&mipi_dcphy0 { + status = "okay"; }; &mipi0_csi2 { @@ -109,70 +95,42 @@ mipi0_csi2_output: endpoint@0 { reg = <0>; - remote-endpoint = <&cif_mipi0_in0>; + remote-endpoint = <&cif_mipi_in0>; }; }; }; }; -&pinctrl { - cam { - mipidcphy0_pwr: mipidcphy0-pwr { - rockchip,pins = - /* camera power en */ - <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; -}; - -&rkcif { +&rkcif_mipi_lvds { status = "okay"; -// memory-region = <&cif_reserved>; -}; - -&rkcif_mipi_lvds2 { - status = "okay"; - //firefly,yuv_camera; port { - cif_mipi0_in0: endpoint { + cif_mipi_in0: endpoint { remote-endpoint = <&mipi0_csi2_output>; }; }; }; -&rkcif_mipi_lvds2_sditf { +&rkcif_mipi_lvds_sditf { status = "disabled"; port { - mipi_lvds2_sditf: endpoint { - remote-endpoint = <&isp0_vir0>; + mipi_lvds_sditf: endpoint { + remote-endpoint = <&isp1_in1>; }; }; }; -&rkcif_mmu { - status = "okay"; -}; - -&rkisp0 { - status = "disabled"; -}; - -&isp0_mmu { - status = "disabled"; -}; - -&rkisp0_vir0 { +&rkisp1_vir0 { status = "disabled"; port { #address-cells = <1>; #size-cells = <0>; - isp0_vir0: endpoint@0 { + isp1_in1: endpoint@0 { reg = <0>; - remote-endpoint = <&mipi_lvds2_sditf>; + remote-endpoint = <&mipi_lvds_sditf>; }; }; };