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

bmx666 · Nov 27, 2024 · 96a969a · 96a969a
1 parent 43b602d
commit 96a969a
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 54 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
@@ -30,6 +30,13 @@
 		#clock-cells = <0>;
 	};
 
+	fake_imx219_clk: fake-imx219-clock {
+		compatible = "fixed-clock";
+		clock-frequency = <24000000>;
+		clock-output-names = "CLK_CAMERA_24MHZ";
+		#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-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam0-imx219.dts
@@ -1,8 +1,6 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/clock/rk3588-cru.h>
-#include <dt-bindings/power/rk3588-power.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 
@@ -26,15 +24,12 @@
 				compatible = "sony,imx219";
 				reg = <0x10>;
 
-				power-domains = <&power RK3588_PD_VI>;
-				rockchip,grf = <&sys_grf>;
-
 				pinctrl-names = "default";
-				pinctrl-0 = <&mipim0_camera1_clk &aw9523_cam0_reset_pins>;
+				pinctrl-0 = <&aw9523_cam0_powerdown_pins>;
 
-				reset-gpios = <&aw9523 0 GPIO_ACTIVE_HIGH>;
+				reset-gpios = <&aw9523 1 GPIO_ACTIVE_HIGH>;
 
-				clocks = <&cru CLK_MIPI_CAMARAOUT_M1>;
+				clocks = <&fake_imx219_clk>;
 				clock-names = "xvclk";
 
 				VANA-supply = <&camera_vdda_2v8>;  /* 2.8v */

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam0-ov5640.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam0-ov5640.dts
@@ -32,8 +32,8 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&mipim0_camera1_clk &aw9523_cam0_powerdown_pins &aw9523_cam0_reset_pins>;
 
-				reset-gpios = <&aw9523 0 GPIO_ACTIVE_HIGH>;
-				powerdown-gpios = <&aw9523 1 GPIO_ACTIVE_LOW>;
+				reset-gpios = <&aw9523 0 GPIO_ACTIVE_LOW>;
+				powerdown-gpios = <&aw9523 1 GPIO_ACTIVE_HIGH>;
 
 				clocks = <&cru CLK_MIPI_CAMARAOUT_M1>;
 				clock-names = "xclk";

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam1-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam1-imx219.dts
@@ -1,8 +1,6 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/clock/rk3588-cru.h>
-#include <dt-bindings/power/rk3588-power.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 
@@ -26,15 +24,12 @@
 				compatible = "sony,imx219";
 				reg = <0x10>;
 
-				power-domains = <&power RK3588_PD_VI>;
-				rockchip,grf = <&sys_grf>;
-
 				pinctrl-names = "default";
-				pinctrl-0 = <&mipim0_camera2_clk &aw9523_cam1_reset_pins>;
+				pinctrl-0 = <&aw9523_cam1_powerdown_pins>;
 
-				reset-gpios = <&aw9523 2 GPIO_ACTIVE_HIGH>;
+				reset-gpios = <&aw9523 3 GPIO_ACTIVE_HIGH>;
 
-				clocks = <&cru CLK_MIPI_CAMARAOUT_M2>;
+				clocks = <&fake_imx219_clk>;
 				clock-names = "xvclk";
 
 				VANA-supply = <&camera_vdda_2v8>;  /* 2.8v */

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam1-ov5640.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam1-ov5640.dts
@@ -32,8 +32,8 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&mipim0_camera2_clk &aw9523_cam1_powerdown_pins &aw9523_cam1_reset_pins>;
 
-				reset-gpios = <&aw9523 2 GPIO_ACTIVE_HIGH>;
-				powerdown-gpios = <&aw9523 3 GPIO_ACTIVE_LOW>;
+				reset-gpios = <&aw9523 2 GPIO_ACTIVE_LOW>;
+				powerdown-gpios = <&aw9523 3 GPIO_ACTIVE_HIGH>;
 
 				clocks = <&cru CLK_MIPI_CAMARAOUT_M2>;
 				clock-names = "xclk";

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam2-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam2-imx219.dts
@@ -1,8 +1,6 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/clock/rk3588-cru.h>
-#include <dt-bindings/power/rk3588-power.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 
@@ -26,15 +24,12 @@
 				compatible = "sony,imx219";
 				reg = <0x10>;
 
-				power-domains = <&power RK3588_PD_VI>;
-				rockchip,grf = <&sys_grf>;
-
 				pinctrl-names = "default";
-				pinctrl-0 = <&mipim0_camera3_clk &aw9523_cam2_reset_pins>;
+				pinctrl-0 = <&aw9523_cam2_powerdown_pins>;
 
-				reset-gpios = <&aw9523 4 GPIO_ACTIVE_HIGH>;
+				reset-gpios = <&aw9523 5 GPIO_ACTIVE_HIGH>;
 
-				clocks = <&cru CLK_MIPI_CAMARAOUT_M3>;
+				clocks = <&fake_imx219_clk>;
 				clock-names = "xvclk";
 
 				VANA-supply = <&camera_vdda_2v8>;  /* 2.8v */

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam2-ov5640.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam2-ov5640.dts
@@ -32,8 +32,8 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&mipim0_camera3_clk &aw9523_cam2_powerdown_pins &aw9523_cam2_reset_pins>;
 
-				reset-gpios = <&aw9523 4 GPIO_ACTIVE_HIGH>;
-				powerdown-gpios = <&aw9523 5 GPIO_ACTIVE_LOW>;
+				reset-gpios = <&aw9523 4 GPIO_ACTIVE_LOW>;
+				powerdown-gpios = <&aw9523 5 GPIO_ACTIVE_HIGH>;
 
 				clocks = <&cru CLK_MIPI_CAMARAOUT_M3>;
 				clock-names = "xclk";

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam3-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam3-imx219.dts
@@ -1,8 +1,6 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/clock/rk3588-cru.h>
-#include <dt-bindings/power/rk3588-power.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 
@@ -26,15 +24,12 @@
 				compatible = "sony,imx219";
 				reg = <0x10>;
 
-				power-domains = <&power RK3588_PD_VI>;
-				rockchip,grf = <&sys_grf>;
-
 				pinctrl-names = "default";
-				pinctrl-0 = <&mipim0_camera4_clk &aw9523_cam3_reset_pins>;
+				pinctrl-0 = <&aw9523_cam3_powerdown_pins>;
 
 				reset-gpios = <&aw9523 7 GPIO_ACTIVE_HIGH>;
 
-				clocks = <&cru CLK_MIPI_CAMARAOUT_M4>;
+				clocks = <&fake_imx219_clk>;
 				clock-names = "xvclk";
 
 				VANA-supply = <&camera_vdda_2v8>;  /* 2.8v */

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam3-ov5640.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam3-ov5640.dts
@@ -32,8 +32,8 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&mipim0_camera4_clk &aw9523_cam3_powerdown_pins &aw9523_cam3_reset_pins>;
 
-				reset-gpios = <&aw9523 7 GPIO_ACTIVE_HIGH>;
-				powerdown-gpios = <&aw9523 6 GPIO_ACTIVE_LOW>;
+				reset-gpios = <&aw9523 6 GPIO_ACTIVE_LOW>;
+				powerdown-gpios = <&aw9523 7 GPIO_ACTIVE_HIGH>;
 
 				clocks = <&cru CLK_MIPI_CAMARAOUT_M4>;
 				clock-names = "xclk";

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
@@ -32,7 +32,7 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&mipim0_camera4_clk &aw9523_cam3_powerdown_pins>;
 
-				pwdn-gpios = <&aw9523 6 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 7 GPIO_ACTIVE_LOW>;
 
 				clocks = <&cru CLK_MIPI_CAMARAOUT_M4>;
 				clock-names = "xvclk";

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam4-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam4-imx219.dts
@@ -1,8 +1,6 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/clock/rk3588-cru.h>
-#include <dt-bindings/power/rk3588-power.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 
@@ -20,18 +18,18 @@
 		__overlay__ {
 			status = "okay";
 
-			cam4_imx219: cam4_imx219@3c {
+			cam4_imx219: cam4_imx219@10 {
 				status = "okay";
 
 				compatible = "sony,imx219";
 				reg = <0x10>;
 
 				pinctrl-names = "default";
-				pinctrl-0 = <&aw9523_cam4_reset_pins>;
+				pinctrl-0 = <&aw9523_cam4_powerdown_pins>;
 
 				reset-gpios = <&aw9523 9 GPIO_ACTIVE_HIGH>;
 
-				clocks = <&ext_cam_clk>;
+				clocks = <&fake_imx219_clk>;
 				clock-names = "xvclk";
 
 				VANA-supply = <&camera_vdda_2v8>;  /* 2.8v */

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam4-ov5640.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam4-ov5640.dts
@@ -29,8 +29,8 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&aw9523_cam4_powerdown_pins &aw9523_cam4_reset_pins>;
 
-				reset-gpios = <&aw9523 9 GPIO_ACTIVE_HIGH>;
-				powerdown-gpios = <&aw9523 8 GPIO_ACTIVE_LOW>;
+				reset-gpios = <&aw9523 8 GPIO_ACTIVE_LOW>;
+				powerdown-gpios = <&aw9523 9 GPIO_ACTIVE_HIGH>;
 
 				clocks = <&ext_cam_clk>;
 				clock-names = "xclk";

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
@@ -29,7 +29,7 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&aw9523_cam4_powerdown_pins>;
 
-				pwdn-gpios = <&aw9523 8 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 9 GPIO_ACTIVE_LOW>;
 
 				clocks = <&ext_cam_clk>;
 				clock-names = "xvclk";

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam5-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam5-imx219.dts
@@ -20,18 +20,18 @@
 		__overlay__ {
 			status = "okay";
 
-			cam5_imx219: cam5_imx219@3c {
+			cam5_imx219: cam5_imx219@10 {
 				status = "okay";
 
 				compatible = "sony,imx219";
 				reg = <0x10>;
 
 				pinctrl-names = "default";
-				pinctrl-0 = <&aw9523_cam5_reset_pins>;
+				pinctrl-0 = <&aw9523_cam5_powerdown_pins>;
 
 				reset-gpios = <&aw9523 11 GPIO_ACTIVE_HIGH>;
 
-				clocks = <&ext_cam_clk>;
+				clocks = <&fake_imx219_clk>;
 				clock-names = "xvclk";
 
 				VANA-supply = <&camera_vdda_2v8>;  /* 2.8v */

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam5-ov5640.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam5-ov5640.dts
@@ -29,8 +29,8 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&aw9523_cam5_powerdown_pins &aw9523_cam5_reset_pins>;
 
-				reset-gpios = <&aw9523 11 GPIO_ACTIVE_HIGH>;
-				powerdown-gpios = <&aw9523 10 GPIO_ACTIVE_LOW>;
+				reset-gpios = <&aw9523 10 GPIO_ACTIVE_LOW>;
+				powerdown-gpios = <&aw9523 11 GPIO_ACTIVE_HIGH>;
 
 				clocks = <&ext_cam_clk>;
 				clock-names = "xclk";

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
@@ -29,7 +29,7 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&aw9523_cam5_powerdown_pins>;
 
-				pwdn-gpios = <&aw9523 10 GPIO_ACTIVE_LOW>;
+				pwdn-gpios = <&aw9523 11 GPIO_ACTIVE_LOW>;
 
 				clocks = <&ext_cam_clk>;
 				clock-names = "xvclk";