Update for opicm5

arch/arm64/boot/dts/rockchip/overlay/Makefile

@@ -10,6 +10,7 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3588-i2c5-m3.dtbo \
 	rk3588-i2c6-m4.dtbo \
 	rk3588-i2c7-m0.dtbo \
+	rk3588-i2c7-m3.dtbo \
 	rk3588-i2c8-m2.dtbo \
 	rk3588-pwm0-m0.dtbo \
 	rk3588-pwm0-m1.dtbo \
@@ -89,6 +90,10 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3588-opi5max-disable-leds.dtbo \
 	rk3588-opi5pro-sfc.dtbo \
 	rk3588-opicm5-blink-gpio.dtbo \
+	rk3588-opicm5-cam1.dtbo \
+	rk3588-opicm5-cam2.dtbo \
+	rk3588-opicm5-cam3.dtbo \
+	rk3588-opicm5-cam4.dtbo \
 	rk3588-opicm5-tablet-cam1.dtbo \
 	rk3588-opicm5-tablet-cam2.dtbo \
 	rk3588-opicm5-tablet-cam3.dtbo \

arch/arm64/boot/dts/rockchip/overlay/rk3588-i2c7-m3.dts

@@ -0,0 +1,14 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&i2c7>;
+
+		__overlay__ {
+			status = "okay";
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c7m3_xfer>;
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-cam1.dts

@@ -0,0 +1,60 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&csi2_dphy1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@1 {
+		target = <&mipi2_csi2>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@2 {
+		target = <&rkcif_mipi_lvds2>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@3 {
+		target = <&rkcif_mipi_lvds2_sditf>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@4 {
+		target = <&rkisp0_vir0>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@5 {
+		target = <&i2c4>;
+
+		__overlay__ {
+			status = "okay";
+
+			ov5647-1@36 {
+				status = "okay";
+			};
+
+			imx219-1@10 {
+				status = "okay";
+			};
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-cam2.dts

@@ -0,0 +1,60 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&csi2_dphy2>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@1 {
+		target = <&mipi3_csi2>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@2 {
+		target = <&rkcif_mipi_lvds3>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@3 {
+		target = <&rkcif_mipi_lvds3_sditf>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@4 {
+		target = <&rkisp0_vir1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@5 {
+		target = <&i2c3>;
+
+		__overlay__ {
+			status = "okay";
+
+			ov5647-2@36 {
+				status = "okay";
+			};
+
+			imx219-2@10 {
+				status = "okay";
+			};
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-cam3.dts

@@ -0,0 +1,60 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&csi2_dcphy1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@1 {
+		target = <&mipi1_csi2>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@2 {
+		target = <&rkcif_mipi_lvds1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@3 {
+		target = <&rkcif_mipi_lvds1_sditf>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@4 {
+		target = <&rkisp1_vir1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@5 {
+		target = <&i2c5>;
+
+		__overlay__ {
+			status = "okay";
+
+			ov5647-3@36 {
+				status = "okay";
+			};
+
+			imx219-3@10 {
+				status = "okay";
+			};
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-cam4.dts

@@ -0,0 +1,60 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&csi2_dcphy0>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@1 {
+		target = <&mipi0_csi2>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@2 {
+		target = <&rkcif_mipi_lvds>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@3 {
+		target = <&rkcif_mipi_lvds_sditf>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@4 {
+		target = <&rkisp1_vir0>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+
+	fragment@5 {
+		target = <&i2c6>;
+
+		__overlay__ {
+			status = "okay";
+
+			ov5647-4@36 {
+				status = "okay";
+			};
+
+			imx219-4@10 {
+				status = "okay";
+			};
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-camera1.dtsi

@@ -0,0 +1,143 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
+ *
+ */
+
+&csi2_dphy0_hw {
+	status = "okay";
+};
+
+&csi2_dphy1 {
+	status = "disabled";
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipidphy1_in_ucam0: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&ov5647_1_out1>;
+				data-lanes = <1 2>;
+			};
+
+			mipidphy1_in_ucam1: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&imx219_1_out1>;
+				data-lanes = <1 2>;
+			};
+		};
+		port@1 {
+		        reg = <1>;
+		        #address-cells = <1>;
+		        #size-cells = <0>;
+		        csidphy0_out: endpoint@0 {
+		                reg = <0>;
+		                remote-endpoint = <&mipi2_csi2_input>;
+		        };
+		};
+	};
+};
+
+&i2c4 {
+	status = "okay";
+	ddpinctrl-names = "default";
+	pinctrl-0 = <&i2c4m3_xfer>;
+
+	ov5647_1: ov5647-1@36 {
+		status = "disabled";
+		compatible = "ovti,ov5647";
+		reg = <0x36>;
+		clocks = <&ext_cam_ov5647_clk>;
+		clock-names = "ext_cam_ov5647_clk";
+		pwdn-gpios = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
+		rockchip,camera-module-index = <0>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "rpi-camera-v1";
+		rockchip,camera-module-lens-name = "default";
+		port {
+			ov5647_1_out1: endpoint {
+				remote-endpoint = <&mipidphy1_in_ucam0>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
+
+	imx219_1: imx219-1@10 {
+		status = "disabled";
+		compatible = "sony,imx219";
+		reg = <0x10>;
+		clocks = <&ext_cam_ov5647_clk>;
+		clock-names = "ext_cam_ov5647_clk";
+		pwdn-gpios = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
+		rockchip,camera-module-index = <0>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "rpi-camera-v2";
+		rockchip,camera-module-lens-name = "default";
+		port {
+			imx219_1_out1: endpoint {
+				remote-endpoint = <&mipidphy1_in_ucam1>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
+};
+
+&mipi2_csi2 {
+	status = "disabled";
+	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 = "disabled";
+	port {
+		cif_mipi_in2: endpoint {
+			remote-endpoint = <&mipi2_csi2_output>;
+		};
+	};
+};
+
+&rkcif_mipi_lvds2_sditf {
+	status = "disabled";
+	port {
+		mipi2_lvds_sditf: endpoint {
+			remote-endpoint = <&isp0_vir0>;
+		};
+	};
+};
+
+&rkisp0_vir0 {
+	status = "disabled";
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		isp0_vir0: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&mipi2_lvds_sditf>;
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-camera2.dtsi

@@ -0,0 +1,143 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
+ *
+ */
+
+&csi2_dphy0_hw {
+	status = "okay";
+};
+
+&csi2_dphy2 {
+	status = "disabled";
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipidphy2_in_ucam0: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&ov5647_2_out1>;
+				data-lanes = <1 2>;
+			};
+
+			mipidphy2_in_ucam1: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&imx219_2_out1>;
+				data-lanes = <1 2>;
+			};
+		};
+		port@1 {
+		        reg = <1>;
+		        #address-cells = <1>;
+		        #size-cells = <0>;
+		        csidphy2_out: endpoint@0 {
+		                reg = <0>;
+		                remote-endpoint = <&mipi3_csi2_input>;
+		        };
+		};
+	};
+};
+
+&i2c3 {
+	status = "okay";
+	ddpinctrl-names = "default";
+	pinctrl-0 = <&i2c3m2_xfer>;
+
+	ov5647_2: ov5647-2@36 {
+		status = "disabled";
+		compatible = "ovti,ov5647";
+		reg = <0x36>;
+		clocks = <&ext_cam_ov5647_clk>;
+		clock-names = "ext_cam_ov5647_clk";
+		pwdn-gpios = <&gpio1 RK_PD1 GPIO_ACTIVE_LOW>;
+		rockchip,camera-module-index = <1>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "rpi-camera-v1";
+		rockchip,camera-module-lens-name = "default";
+		port {
+			ov5647_2_out1: endpoint {
+				remote-endpoint = <&mipidphy2_in_ucam0>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
+
+	imx219_2: imx219-2@10 {
+		status = "disabled";
+		compatible = "sony,imx219";
+		reg = <0x10>;
+		clocks = <&ext_cam_ov5647_clk>;
+		clock-names = "ext_cam_ov5647_clk";
+		pwdn-gpios = <&gpio1 RK_PD1 GPIO_ACTIVE_LOW>;
+		rockchip,camera-module-index = <1>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "rpi-camera-v2";
+		rockchip,camera-module-lens-name = "default";
+		port {
+			imx219_2_out1: endpoint {
+				remote-endpoint = <&mipidphy2_in_ucam1>;
+				data-lanes = <1 2>;
+			};
+		};
+	};
+};
+
+&mipi3_csi2 {
+	status = "disabled";
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			mipi3_csi2_input: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&csidphy2_out>;
+			};
+		};
+		port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			mipi3_csi2_output: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&cif_mipi_in3>;
+			};
+		};
+	};
+};
+
+&rkcif_mipi_lvds3 {
+	status = "disabled";
+	port {
+		cif_mipi_in3: endpoint {
+			remote-endpoint = <&mipi3_csi2_output>;
+		};
+	};
+};
+
+&rkcif_mipi_lvds3_sditf {
+	status = "disabled";
+	port {
+		mipi3_lvds_sditf: endpoint {
+			remote-endpoint = <&isp0_vir1>;
+		};
+	};
+};
+
+&rkisp0_vir1 {
+	status = "disabled";
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		isp0_vir1: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&mipi3_lvds_sditf>;
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-camera3.dtsi

@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
+ *
+ */
+
+&csi2_dcphy1 {
+	status = "disabled";
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipidcphy1_in_ucam0: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&ov5647_3_out1>;
+				data-lanes = <1 2>;
+			};
+
+			mipidcphy1_in_ucam1: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&imx219_3_out1>;
+				data-lanes = <1 2>;
+			};
+		};
+
+		port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			csidcphy1_out: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&mipi1_csi2_input>;
+			};
+		};
+	};
+};
+
+&i2c5 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c5m2_xfer>;
+
+	ov5647_3: ov5647-3@36 {
+		status = "disabled";
+		compatible = "ovti,ov5647";
+		reg = <0x36>;
+		clocks = <&ext_cam_ov5647_clk>;
+		clock-names = "ext_cam_ov5647_clk";
+		pwdn-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_LOW>;
+		rockchip,camera-module-index = <2>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "rpi-camera-v1";
+		rockchip,camera-module-lens-name = "default";
+		port {
+			ov5647_3_out1: endpoint {
+			        remote-endpoint = <&mipidcphy1_in_ucam0>;
+			        data-lanes = <1 2>;
+			};
+		};
+	};
+
+	imx219_3: imx219-3@10 {
+		status = "disabled";
+		compatible = "sony,imx219";
+		reg = <0x10>;
+		clocks = <&ext_cam_ov5647_clk>;
+		clock-names = "ext_cam_ov5647_clk";
+		pwdn-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_LOW>;
+		rockchip,camera-module-index = <2>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "rpi-camera-v2";
+		rockchip,camera-module-lens-name = "default";
+		port {
+			imx219_3_out1: endpoint {
+			        remote-endpoint = <&mipidcphy1_in_ucam1>;
+			        data-lanes = <1 2>;
+			};
+		};
+	};
+};
+
+&mipi1_csi2 {
+	status = "disabled";
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipi1_csi2_input: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&csidcphy1_out>;
+			};
+		};
+
+		port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipi1_csi2_output: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&cif_mipi_in1>;
+			};
+		};
+	};
+};
+
+&rkcif_mipi_lvds1 {
+	status = "disabled";
+
+	port {
+		cif_mipi_in1: endpoint {
+			remote-endpoint = <&mipi1_csi2_output>;
+		};
+	};
+};
+
+&rkcif_mipi_lvds1_sditf {
+	status = "disabled";
+
+        port {
+                mipi1_lvds_sditf: endpoint {
+                        remote-endpoint = <&isp1_in0>;
+                };
+        };
+};
+
+&rkisp1_vir1 {
+	status = "disabled";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		isp1_in0: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&mipi1_lvds_sditf>;
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-camera4.dtsi

@@ -0,0 +1,151 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
+ *
+ */
+
+&csi2_dcphy0 {
+	status = "disabled";
+
+	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 = <&ov5647_4_out>;
+				data-lanes = <1 2>;
+			};
+
+			mipidcphy0_in_ucam1: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&imx219_4_out>;
+				data-lanes = <1 2>;
+			};
+		};
+
+		port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			csidcphy0_out: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&mipi0_csi2_input>;
+			};
+		};
+	};
+};
+
+&i2c6 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c6m3_xfer>;
+
+	ov5647_4: ov5647-4@36 {
+		status = "disabled";
+		compatible = "ovti,ov5647";
+		reg = <0x36>;
+		clocks = <&ext_cam_ov5647_clk>;
+		clock-names = "ext_cam_ov5647_clk";
+		pwdn-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>;
+		rockchip,camera-module-index = <3>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "rpi-camera-v1";
+		rockchip,camera-module-lens-name = "default";
+		port {
+			ov5647_4_out: endpoint {
+			        remote-endpoint = <&mipidcphy0_in_ucam0>;
+			        data-lanes = <1 2>;
+			};
+		};
+	};
+
+	imx219_4: imx219-4@10 {
+		status = "disabled";
+		compatible = "sony,imx219";
+		reg = <0x10>;
+		clocks = <&ext_cam_ov5647_clk>;
+		clock-names = "ext_cam_ov5647_clk";
+		pwdn-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>;
+		rockchip,camera-module-index = <3>;
+		rockchip,camera-module-facing = "back";
+		rockchip,camera-module-name = "rpi-camera-v2";
+		rockchip,camera-module-lens-name = "default";
+		port {
+			imx219_4_out: endpoint {
+			        remote-endpoint = <&mipidcphy0_in_ucam1>;
+			        data-lanes = <1 2>;
+			};
+		};
+	};
+};
+
+&mipi0_csi2 {
+	status = "disabled";
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipi0_csi2_input: endpoint@1 {
+				reg = <1>;
+				remote-endpoint = <&csidcphy0_out>;
+			};
+		};
+
+		port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			mipi0_csi2_output: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&cif_mipi_in0>;
+			};
+		};
+	};
+};
+
+&rkcif_mipi_lvds {
+	status = "disabled";
+
+	port {
+		cif_mipi_in0: endpoint {
+			remote-endpoint = <&mipi0_csi2_output>;
+		};
+	};
+};
+
+&rkcif_mipi_lvds_sditf {
+	status = "disabled";
+
+	port {
+		mipi_lvds_sditf: endpoint {
+			remote-endpoint = <&isp1_in1>;
+		};
+	};
+};
+
+&rkisp1_vir0 {
+	status = "disabled";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		isp1_in1: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&mipi_lvds_sditf>;
+		};
+	};
+};

arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dts

@@ -8,6 +8,10 @@
 
 #include "rk3588s-orangepi-cm5.dtsi"
 #include "rk3588-linux.dtsi"
+#include "rk3588s-orangepi-cm5-camera1.dtsi"
+#include "rk3588s-orangepi-cm5-camera2.dtsi"
+#include "rk3588s-orangepi-cm5-camera3.dtsi"
+#include "rk3588s-orangepi-cm5-camera4.dtsi"
 
 / {
 	model = "Orange Pi CM5";
@@ -56,28 +60,27 @@
 		status = "okay";
 
 		lan1@0 {
-			gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_LOW>;
 			label = "lan1";
-			default-state = "off";
+			default-state = "on";
 		};
 
 		lan2@1 {
-			gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
 			label = "lan2";
-			default-state = "off";
+			default-state = "on";
 		};
 
 		wan@3 {
-			gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio0 RK_PC5 GPIO_ACTIVE_LOW>;
 			label = "wan";
-			default-state = "off";
+			default-state = "on";
 		};
 
 		power@4 {
-			gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
 			label = "power";
-			linux,default-trigger = "default-on";
-			linux,default-trigger-delay-ms = <0>;
+			default-state = "off";
 		};
 	};
 
@@ -88,12 +91,35 @@
 
 		button@1 {
 			debounce-interval = <50>;
-			gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_LOW>;
 			label = "K1";
 			linux,code = <KEY_POWER>;
 			wakeup-source;
 		};
 	};
+
+	fan: pwm-fan {
+		compatible = "pwm-fan";
+		#cooling-cells = <2>;
+		pwms = <&pwm13 0 50000 0>;
+		cooling-levels = <0 50 100 150 200 255>;
+		rockchip,temp-trips = <
+			50000   1
+			55000   2
+			60000   3
+			65000   4
+			70000   5
+		>;
+
+		status = "okay";
+	};
+
+	ext_cam_ov5647_clk: external-camera-ov5647-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <25000000>;
+		clock-output-names = "ext_cam_ov5647_clk";
+		#clock-cells = <0>;
+	};
 };
 
 &gmac1 {
@@ -225,10 +251,10 @@
 	};
 };
 
-&i2c3 {
+&i2c1 {
 	status = "okay";
 	pinctrl-names = "default";
-	pinctrl-0 = <&i2c3m1_xfer>;
+	pinctrl-0 = <&i2c1m2_xfer>;
 
 	hym8563: hym8563@51 {
 		compatible = "haoyu,hym8563";
@@ -346,7 +372,9 @@
 	gpio-func {
 		leds_gpio: leds-gpio {
 			rockchip,pins =
-				<1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
+				<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,
+				<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
+				<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 };
@@ -360,8 +388,8 @@
 };
 
 &u2phy0_otg {
-        phy-supply = <&vcc5v0_host>;
-        status = "okay";
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
 };
 
 &u2phy2_host {
@@ -391,7 +419,59 @@
 
 	gpio-key {
 		key1_pin: key1-pin {
-			rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>;
+			rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
 };
+
+&pwm13 {
+	status = "okay";
+	pinctrl-names = "active";
+	pinctrl-0 = <&pwm13m1_pins>;
+};
+
+&pwm14 {
+        status = "disabled";
+        pinctrl-names = "active";
+        pinctrl-0 = <&pwm14m1_pins>;
+};
+
+&pwm15 {
+        status = "disabled";
+        pinctrl-names = "active";
+        pinctrl-0 = <&pwm15m1_pins>;
+};
+
+&i2c7 {
+        status = "disabled";
+        pinctrl-names = "default";
+        pinctrl-0 = <&i2c7m3_xfer>;
+};
+
+&uart4 {
+        status = "disabled";
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart4m2_xfer>;
+};
+
+
+&uart7 {
+        status = "disabled";
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart7m2_xfer>;
+};
+
+&can1 {
+        status = "disabled";
+        pinctrl-names = "default";
+        pinctrl-0 = <&can1m1_pins>;
+        assigned-clocks = <&cru CLK_CAN1>;
+        assigned-clock-rates = <200000000>;
+};
+
+&spi0 {
+        status = "disabled";
+        assigned-clocks = <&cru CLK_SPI0>;
+        assigned-clock-rates = <200000000>;
+        num-cs = <2>;
+};

arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi

@@ -29,41 +29,6 @@
 		regulator-max-microvolt = <1800000>;
 		vin-supply = <&avcc_1v8_s0>;
 	};
-
-	wireless_bluetooth: wireless-bluetooth {
-		compatible = "bluetooth-platdata";
-		clocks = <&hym8563>;
-		clock-names = "ext_clock";
-		uart_rts_gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>;
-		pinctrl-names = "default", "rts_gpio";
-		pinctrl-0 = <&uart9m2_rtsn>, <&bt_gpio>;
-		pinctrl-1 = <&uart9_gpios>;
-		BT,reset_gpio    = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;
-		BT,wake_gpio     = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
-		status = "disabled";
-	};
-
-	wireless_wlan: wireless-wlan {
-		compatible = "wlan-platdata";
-		wifi_chip_type = "ap6275p";
-		pinctrl-names = "default";
-		pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>;
-		WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
-		WIFI,poweren_gpio = <&gpio0 RK_PD0 GPIO_ACTIVE_HIGH>;
-		status = "disabled";
-	};
-
-	//vbus5v0_typec: vbus5v0-typec {
-	//	compatible = "regulator-fixed";
-	//	regulator-name = "vbus5v0_typec";
-	//	regulator-min-microvolt = <5000000>;
-	//	regulator-max-microvolt = <5000000>;
-	//	enable-active-high;
-	//	gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
-	//	vin-supply = <&vcc5v0_usb>;
-	//	pinctrl-names = "default";
-	//	pinctrl-0 = <&typec5v_pwren>;
-	//};
 };
 
 &pwm6 {
@@ -79,13 +44,11 @@
 };
 
 &backlight_1 {
-	pwms = <&pwm6 0 25000 0>;
-	status = "okay";
+	status = "disabled";
 };
 
 &backlight {
-	pwms = <&pwm2 0 25000 0>;
-	status = "okay";
+	status = "disabled";
 };
 
 &combphy0_ps {
@@ -93,11 +56,11 @@
 };
 
 &dp0 {
-	status = "okay";
+	status = "disabled";
 };
 
 &dp0_in_vp1 {
-	status = "okay";
+	status = "disabled";
 };
 
 &dp0_in_vp2 {
@@ -105,7 +68,7 @@
 };
 
 &dp0_sound{
-	status = "okay";
+	status = "disabled";
 };
 
 &spdif_tx2{
@@ -120,78 +83,6 @@
 	status = "okay";
 };
 
-&i2c6 {
-	status = "disabled";
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c6m3_xfer>;
-
-	//usbc0: fusb302@22 {
-	//	compatible = "fcs,fusb302";
-	//	reg = <0x22>;
-	//	interrupt-parent = <&gpio0>;
-	//	interrupts = <RK_PD3 IRQ_TYPE_LEVEL_LOW>;
-	//	pinctrl-names = "default";
-	//	pinctrl-0 = <&usbc0_int>;
-	//	vbus-supply = <&vbus5v0_typec>;
-	//	status = "disabled";
-
-	//	ports {
-	//		#address-cells = <1>;
-	//		#size-cells = <0>;
-
-	//		port@0 {
-	//			reg = <0>;
-	//			usbc0_role_sw: endpoint@0 {
-	//				remote-endpoint = <&dwc3_0_role_switch>;
-	//			};
-	//		};
-	//	};
-
-	//	usb_con: connector {
-	//		compatible = "usb-c-connector";
-	//		label = "USB-C";
-	//		data-role = "dual";
-	//		power-role = "dual";
-	//		try-power-role = "sink";
-	//		op-sink-microwatt = <1000000>;
-	//		sink-pdos =
-	//			<PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>;
-	//		source-pdos =
-	//			<PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
-
-	//		altmodes {
-	//			#address-cells = <1>;
-	//			#size-cells = <0>;
-
-	//			altmode@0 {
-	//				reg = <0>;
-	//				svid = <0xff01>;
-	//				vdo = <0xffffffff>;
-	//			};
-	//		};
-
-	//		ports {
-	//			#address-cells = <1>;
-	//			#size-cells = <0>;
-
-	//			port@0 {
-	//				reg = <0>;
-	//				usbc0_orien_sw: endpoint {
-	//					remote-endpoint = <&usbdp_phy0_orientation_switch>;
-	//				};
-	//			};
-
-	//			port@1 {
-	//				reg = <1>;
-	//				dp_altmode_mux: endpoint {
-	//					remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
-	//				};
-	//			};
-	//		};
-	//	};
-	//};
-};
-
 &pcie2x1l1 {
 	status = "disabled";
 };
@@ -202,55 +93,6 @@
 	status = "disabled";
 };
 
-&pinctrl {
-	lcd {
-		lcd0_rst_gpio: lcd0-rst-gpio {
-			rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		lcd1_rst_gpio: lcd1-rst-gpio {
-			rockchip,pins = <1 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
-	usb-typec {
-		usbc0_int: usbc0-int {
-			rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-
-		typec5v_pwren: typec5v-pwren {
-			rockchip,pins = <3 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
-
-	wireless-bluetooth {
-		uart9_gpios: uart9-gpios {
-			rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-
-		bt_gpio: bt-gpio {
-			rockchip,pins =
-				<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
-				<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-	};
-
-	wireless-wlan {
-		wifi_host_wake_irq: wifi-host-wake-irq {
-			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_down>;
-		};
-
-		wifi_poweren_gpio: wifi-poweren-gpio {
-			rockchip,pins = <0 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-	};
-};
-
-&u2phy0_otg {
-	rockchip,typec-vbus-det;
-	status = "okay";
-};
-
 &uart9 {
 	status = "disabled";
 	pinctrl-names = "default";
@@ -258,49 +100,40 @@
 };
 
 &usbdp_phy0 {
-	//orientation-switch;
-	//svid = <0xff01>;
-	//sbu1-dc-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
-	//sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+	rockchip,dp-lane-mux = <2 3>;
+};
 
-	//port {
-	//	#address-cells = <1>;
-	//	#size-cells = <0>;
-	//	usbdp_phy0_orientation_switch: endpoint@0 {
-	//		reg = <0>;
-	//		remote-endpoint = <&usbc0_orien_sw>;
-	//	};
+&usbdp_phy0_dp {
+	status = "disbaled";
+};
 
-	//	usbdp_phy0_dp_altmode_mux: endpoint@1 {
-	//		reg = <1>;
-	//		remote-endpoint = <&dp_altmode_mux>;
-	//	};
-	//};
+&usbdp_phy0_u3 {
+        status = "okay";
+};
+
+&usbdrd3_0 {
+	status = "okay";
 };
 
 &usbdrd_dwc3_0 {
 	status = "okay";
-	dr_mode = "host";
-	usb-role-switch;
-	//port {
-	//	#address-cells = <1>;
-	//	#size-cells = <0>;
-	//	dwc3_0_role_switch: endpoint@0 {
-	//		reg = <0>;
-	//		remote-endpoint = <&usbc0_role_sw>;
-	//	};
-	//};
+	dr_mode = "otg";
+	extcon = <&u2phy0>;
 };
 
-&combphy2_psu {
-        status = "okay";
-};
-
-&usbhost3_0 {
-	dr_mode = "host";
-	status = "disabled";
+&u2phy0 {
+	status = "okay";
 };
 
 &usbhost_dwc3_0 {
+	status = "disabled";
+};
+
+&combphy2_psu {
 	status = "okay";
 };
+
+&usbhost3_0 {
+	status = "disabled";
+};