patch: kernel: rk35xx-vendor-6.1: adakta-ad: upd camera

bmx666 · Dec 2, 2024 · cccdd71 · cccdd71
1 parent dd2a234
commit cccdd71
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 18 deletions.
diff --git a/patch/kernel/rk35xx-vendor-6.1/dt/rk3588-adakta-ad-base-camera.dtsi b/patch/kernel/rk35xx-vendor-6.1/dt/rk3588-adakta-ad-base-camera.dtsi
@@ -31,12 +31,21 @@
 	};
 
 	fake_imx219_clk: fake-imx219-clock {
+		status = "okay";
 		compatible = "fixed-clock";
 		clock-frequency = <24000000>;
 		clock-output-names = "CLK_CAMERA_24MHZ";
 		#clock-cells = <0>;
 	};
 
+	clk_cam_25m: external-camera-clock-25m {
+		status = "okay";
+		compatible = "fixed-clock";
+		clock-frequency = <25000000>;
+		clock-output-names = "clk_cam_25m";
+		#clock-cells = <0>;
+	};
+
 	camera_vdddo_1v8: camera-vdddo-1v8 {
 		compatible = "regulator-fixed";
 		regulator-name = "camera_vdddo_1v8";

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam0-ov5647.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam0-ov5647.dts
@@ -30,11 +30,11 @@
 				rockchip,grf = <&sys_grf>;
 
 				pinctrl-names = "default";
-				pinctrl-0 = <&mipim0_camera1_clk &aw9523_cam0_powerdown_pins>;
+				pinctrl-0 = <&aw9523_cam0_reset_pins>;
 
-				pwdn-gpios = <&aw9523 1 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 0 GPIO_ACTIVE_LOW>;
 
-				clocks = <&cru CLK_MIPI_CAMARAOUT_M1>;
+				clocks = <&clk_cam_25m>;
 				clock-names = "xvclk";
 
 				rockchip,camera-module-index = <0>;

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam1-ov5647.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam1-ov5647.dts
@@ -30,11 +30,11 @@
 				rockchip,grf = <&sys_grf>;
 
 				pinctrl-names = "default";
-				pinctrl-0 = <&mipim0_camera2_clk &aw9523_cam1_powerdown_pins>;
+				pinctrl-0 = <&aw9523_cam1_reset_pins>;
 
-				pwdn-gpios = <&aw9523 3 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 2 GPIO_ACTIVE_LOW>;
 
-				clocks = <&cru CLK_MIPI_CAMARAOUT_M2>;
+				clocks = <&clk_cam_25m>;
 				clock-names = "xvclk";
 
 				rockchip,camera-module-index = <1>;

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam2-ov5647.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam2-ov5647.dts
@@ -30,11 +30,11 @@
 				rockchip,grf = <&sys_grf>;
 
 				pinctrl-names = "default";
-				pinctrl-0 = <&mipim0_camera3_clk &aw9523_cam2_powerdown_pins>;
+				pinctrl-0 = <&aw9523_cam2_reset_pins>;
 
-				pwdn-gpios = <&aw9523 5 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 4 GPIO_ACTIVE_LOW>;
 
-				clocks = <&cru CLK_MIPI_CAMARAOUT_M3>;
+				clocks = <&clk_cam_25m>;
 				clock-names = "xvclk";
 
 				rockchip,camera-module-index = <2>;

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam3-ov5647.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam3-ov5647.dts
@@ -30,11 +30,11 @@
 				rockchip,grf = <&sys_grf>;
 
 				pinctrl-names = "default";
-				pinctrl-0 = <&mipim0_camera4_clk &aw9523_cam3_powerdown_pins>;
+				pinctrl-0 = <&aw9523_cam3_reset_pins>;
 
-				pwdn-gpios = <&aw9523 7 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 6 GPIO_ACTIVE_LOW>;
 
-				clocks = <&cru CLK_MIPI_CAMARAOUT_M4>;
+				clocks = <&clk_cam_25m>;
 				clock-names = "xvclk";
 
 				rockchip,camera-module-index = <3>;

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam4-ov5647.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam4-ov5647.dts
@@ -27,11 +27,11 @@
 				reg = <0x36>;
 
 				pinctrl-names = "default";
-				pinctrl-0 = <&aw9523_cam4_powerdown_pins>;
+				pinctrl-0 = <&aw9523_cam4_reset_pins>;
 
-				pwdn-gpios = <&aw9523 9 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 8 GPIO_ACTIVE_LOW>;
 
-				clocks = <&ext_cam_clk>;
+				clocks = <&clk_cam_25m>;
 				clock-names = "xvclk";
 
 				rockchip,camera-module-index = <4>;

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam5-ov5647.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam5-ov5647.dts
@@ -27,11 +27,11 @@
 				reg = <0x36>;
 
 				pinctrl-names = "default";
-				pinctrl-0 = <&aw9523_cam5_powerdown_pins>;
+				pinctrl-0 = <&aw9523_cam5_reset_pins>;
 
-				pwdn-gpios = <&aw9523 11 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 10 GPIO_ACTIVE_LOW>;
 
-				clocks = <&ext_cam_clk>;
+				clocks = <&clk_cam_25m>;
 				clock-names = "xvclk";
 
 				rockchip,camera-module-index = <5>;