From fe00185d9f6344e536768404b9d7324c7dd7ae4e Mon Sep 17 00:00:00 2001 From: Maxim Paymushkin Date: Wed, 27 Nov 2024 14:36:04 +0100 Subject: [PATCH] patch: kernel: rk35xx-vendor-6.1: adakta-ad: upd camera --- .../dt/rk3588-adakta-ad-base-camera.dtsi | 7 +++++++ .../overlay/adakta-ad-cam0-imx219.dts | 11 +++-------- .../overlay/adakta-ad-cam1-imx219.dts | 11 +++-------- .../overlay/adakta-ad-cam2-imx219.dts | 11 +++-------- .../overlay/adakta-ad-cam3-imx219.dts | 9 ++------- .../overlay/adakta-ad-cam3-ov5640.dts | 4 ++-- .../overlay/adakta-ad-cam3-ov5647.dts | 2 +- .../overlay/adakta-ad-cam4-imx219.dts | 6 ++---- .../overlay/adakta-ad-cam4-ov5640.dts | 4 ++-- .../overlay/adakta-ad-cam4-ov5647.dts | 2 +- .../overlay/adakta-ad-cam5-imx219.dts | 4 ++-- .../overlay/adakta-ad-cam5-ov5640.dts | 4 ++-- .../overlay/adakta-ad-cam5-ov5647.dts | 2 +- 13 files changed, 31 insertions(+), 46 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 index 849ee7f00178..772d25539cec 100644 --- 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 index 0e626f7f4d34..00490be20682 100644 --- 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 -#include #include #include @@ -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-cam1-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam1-imx219.dts index 9bea59cf0535..d0565f928ccb 100644 --- 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 -#include #include #include @@ -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-cam2-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam2-imx219.dts index 138a273bd7a5..c4339f8fee7f 100644 --- 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 -#include #include #include @@ -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-cam3-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-ad-cam3-imx219.dts index dbc4c0901c62..5aebad9c3af8 100644 --- 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 -#include #include #include @@ -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 index 89319ba6125a..ea25071eabfd 100644 --- 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_HIGH>; + powerdown-gpios = <&aw9523 7 GPIO_ACTIVE_LOW>; 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 index c84493d224e9..0e669a2a06ea 100644 --- 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 index c7eb6ceb0581..92c2d832ff62 100644 --- 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 -#include #include #include @@ -27,11 +25,11 @@ 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 index 81b2da5f2fa5..ebcff4efb2bf 100644 --- 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_HIGH>; + powerdown-gpios = <&aw9523 9 GPIO_ACTIVE_LOW>; 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 index a54799a55839..aaffe0de652c 100644 --- 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 index 65a28919f376..96e8c1b4611e 100644 --- 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 @@ -27,11 +27,11 @@ 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 index 4d15f6cfc2a1..4301c29330c2 100644 --- 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_HIGH>; + powerdown-gpios = <&aw9523 11 GPIO_ACTIVE_LOW>; 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 index 77e0ff3bb67c..45e043eab396 100644 --- 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";