updating camera overlays

OpenHD · Jul 23, 2024 · 6c3e0f8 · 6c3e0f8
1 parent f6eea51
commit 6c3e0f8
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 22 deletions.
diff --git a/arch/arm64/boot/dts/rockchip/overlays/Makefile b/arch/arm64/boot/dts/rockchip/overlays/Makefile
@@ -124,6 +124,7 @@ dtb-$(CONFIG_CLK_RK3568) += \
 	radxa-cm3-rpi-cm4-arducam-imx708-cam0.dtbo \
 	radxa-cm3-rpi-cm4-arducam-imx708-cam1.dtbo \
 	radxa-cm3-rpi-cm4-veye-m2m.dtbo \
+	radxa-cm3-rpi-cm4-rpi-cam-v1.dtbo \
 	radxa-cm3-rpi-cm4-hdmi-in.dtbo \
 	radxa-cm3s-io-csi0-okdo-5mp-camera.dtbo \
 	radxa-cm3s-io-csi0-rpi-camera-v1p3.dtbo \
@@ -405,6 +406,8 @@ dtb-$(CONFIG_CPU_RK3588) += \
 	radxa-cm5-rpi-cm4-io-raspi-7inch-ts-disp0.dtbo \
 	radxa-cm5-rpi-cm4-io-raspi-7inch-ts-disp1.dtbo \
 	radxa-cm5-rpi-cm4-io-arducam-imx708.dtbo \
+	radxa-cm5-rpi-cm4-io-arducam-imx708_HDR.dtbo \
+	radxa-cm5-rpi-cm4-io-arducam-pivariety.dtbo \
 	rock-5-itx-enable-sharp-lq133t1jw01-edp-lcd-disable-dp1.dtbo \
 	rock-5-itx-okdo-5mp-camera-on-cam0.dtbo \
 	rock-5-itx-okdo-5mp-camera-on-cam1.dtbo \
@@ -423,11 +426,17 @@ dtb-$(CONFIG_CPU_RK3588) += \
 	rock-5a-radxa-display-10fhd.dtbo \
 	rock-5a-raspi-7inch-touchscreen.dtbo \
 	rock-5a-rpi-camera-v1_3.dtbo \
+	rock-5a-arducam-imx708.dtbo \
+	rock-5a-arducam-imx708-hdr.dtbo \
+	rock-5a-arducam-pivariety.dtbo \
 	rock-5b-okdo-5mp-camera.dtbo \
 	rock-5b-radxa-camera-4k.dtbo \
 	rock-5b-radxa-display-10fhd.dtbo \
 	rock-5b-raspi-7inch-touchscreen.dtbo \
 	rock-5b-rpi-camera-v1_3.dtbo \
+	rock-5b-arducam-imx708-hdr.dtbo \
+	rock-5b-arducam-imx708.dtbo \
+	rock-5b-arducam-pivariety.dtbo \
 	rock-5b-hdmi1-8k.dtbo \
 	rock-5b-hdmi2-8k.dtbo \
 	rock-5b-plus-cam0-radxa-camera-4k.dtbo \

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-arducam-pivariety.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-arducam-pivariety.dts
@@ -3,14 +3,14 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/power/rk3588-power.h>
 
 / {
 	metadata {
-		title ="Enable Arducam Camera Pivariety on ROCK 5A";
+		title ="Enable Arducam Pivariety on ROCK 5A";
 		compatible = "radxa,rock-5a", "rockchip,rk3588";
 		category = "camera";
-		exclusive = "csi2_dphy0";
-		description = "Enable Arducam Camera Pivariety on ROCK 5A";
+		description = "Enable Arducam Pivariety on ROCK 5A.";
 	};
 
 
@@ -43,24 +43,27 @@
 
 		__overlay__ {
 			status = "okay";
+			clock-frequency = <10000>;
+
 			#address-cells = <1>;
 			#size-cells = <0>;
-			
+
 			arducam_pivariety: arducam-pivariety@c {
 				compatible = "arducam,arducam-pivariety";
 				reg = <0x0c>;
 
 				clocks = <&clk_cam_24m>;
 				clock-names = "xclk";
-
+				power-domains = <&power RK3588_PD_VI>;
+				reset-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
 				rockchip,camera-module-index = <0>;
 				rockchip,camera-module-facing = "back";
-				rockchip,camera-module-name = "arducam-pivariety";
+				rockchip,camera-module-name = "IQ";
 				rockchip,camera-module-lens-name = "default";
 
 				port {
 					pivariety_out0: endpoint {
-						remote-endpoint = <&mipidphy0_in_ucam2>;
+						remote-endpoint = <&mipidphy0_in_ucam0>;
 						data-lanes = <1 2>;
 					};
 				};
@@ -77,7 +80,7 @@
 	};
 
 	fragment@3 {
-		target = <&csi2_dphy0>;
+		target = <&csi2_dphy1>;
 
 		__overlay__ {
 			status = "okay";
@@ -91,8 +94,8 @@
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					mipidphy0_in_ucam2: endpoint@3 {
-						reg = <3>;
+					mipidphy0_in_ucam0: endpoint@1 {
+						reg = <1>;
 						remote-endpoint = <&pivariety_out0>;
 						data-lanes = <1 2>;
 					};

diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5b-arducam-pivariety.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5b-arducam-pivariety.dts
@@ -3,14 +3,14 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/power/rk3588-power.h>
 
 / {
 	metadata {
-		title ="Enable Arducam Camera Pivariety on ROCK 5B";
+		title ="Enable Arducam Pivariety on ROCK 5A";
 		compatible = "radxa,rock-5b", "rockchip,rk3588";
 		category = "camera";
-		exclusive = "csi2_dphy0";
-		description = "Enable Arducam Camera Pivariety on ROCK 5B";
+		description = "Enable Arducam Pivariety on ROCK 5B.";
 	};
 
 
@@ -24,7 +24,7 @@
 				regulator-always-on;
 				regulator-boot-on;
 				enable-active-high;
-				gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>;
+				gpio = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&cam_pwdn_gpio>;
 			};
@@ -43,24 +43,27 @@
 
 		__overlay__ {
 			status = "okay";
+			clock-frequency = <10000>;
+
 			#address-cells = <1>;
 			#size-cells = <0>;
-			
+
 			arducam_pivariety: arducam-pivariety@c {
 				compatible = "arducam,arducam-pivariety";
 				reg = <0x0c>;
 
 				clocks = <&clk_cam_24m>;
 				clock-names = "xclk";
-
+				power-domains = <&power RK3588_PD_VI>;
+				reset-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
 				rockchip,camera-module-index = <0>;
 				rockchip,camera-module-facing = "back";
-				rockchip,camera-module-name = "arducam-pivariety";
+				rockchip,camera-module-name = "IQ";
 				rockchip,camera-module-lens-name = "default";
 
 				port {
 					pivariety_out0: endpoint {
-						remote-endpoint = <&mipidphy0_in_ucam2>;
+						remote-endpoint = <&mipidphy0_in_ucam0>;
 						data-lanes = <1 2>;
 					};
 				};
@@ -77,7 +80,7 @@
 	};
 
 	fragment@3 {
-		target = <&csi2_dphy0>;
+		target = <&csi2_dphy1>;
 
 		__overlay__ {
 			status = "okay";
@@ -91,8 +94,8 @@
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					mipidphy0_in_ucam2: endpoint@3 {
-						reg = <3>;
+					mipidphy0_in_ucam0: endpoint@1 {
+						reg = <1>;
 						remote-endpoint = <&pivariety_out0>;
 						data-lanes = <1 2>;
 					};
@@ -231,7 +234,7 @@
 		__overlay__ {
 			camera {
 				cam_pwdn_gpio: cam-pwdn-gpio {
-					rockchip,pins = <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
+					rockchip,pins = <1 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>;
 				};
 			};
 		};