From 55938b2eec5bf4ae2b3192d8beffe11a64039ac3 Mon Sep 17 00:00:00 2001 From: Maxim Paymushkin Date: Mon, 2 Dec 2024 17:30:39 +0100 Subject: [PATCH] patch: kernel: rk35xx-vendor-6.1: adakta-smarc: upd camera --- .../dt/rk3568-adakta-smarc-base-camera.dtsi | 14 ++++++++------ .../overlay/adakta-smarc-cam0-imx219.dts | 2 +- .../overlay/adakta-smarc-cam0-ov5647.dts | 2 +- .../overlay/adakta-smarc-cam1-imx219.dts | 2 +- .../overlay/adakta-smarc-cam1-ov5647.dts | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/patch/kernel/rk35xx-vendor-6.1/dt/rk3568-adakta-smarc-base-camera.dtsi b/patch/kernel/rk35xx-vendor-6.1/dt/rk3568-adakta-smarc-base-camera.dtsi index 07c5ebf74c50..538a0204c2b7 100644 --- a/patch/kernel/rk35xx-vendor-6.1/dt/rk3568-adakta-smarc-base-camera.dtsi +++ b/patch/kernel/rk35xx-vendor-6.1/dt/rk3568-adakta-smarc-base-camera.dtsi @@ -14,17 +14,19 @@ */ / { - ext_cam_clk: external-camera-clock { + clk_cam_24m: external-camera-clock-24m { + status = "okay"; compatible = "fixed-clock"; - clock-frequency = <25000000>; - clock-output-names = "CLK_CAMERA_25MHZ"; + clock-frequency = <24000000>; + clock-output-names = "clk_cam_24m"; #clock-cells = <0>; }; - fake_imx219_clk: fake-imx219-clock { + clk_cam_25m: external-camera-clock-25m { + status = "okay"; compatible = "fixed-clock"; - clock-frequency = <24000000>; - clock-output-names = "CLK_CAMERA_24MHZ"; + clock-frequency = <25000000>; + clock-output-names = "clk_cam_25m"; #clock-cells = <0>; }; diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-imx219.dts index 71b0302c3c21..c3d57c8666e7 100644 --- a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-imx219.dts +++ b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-imx219.dts @@ -29,7 +29,7 @@ reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; - clocks = <&fake_imx219_clk>; + clocks = <&clk_cam_24m>; clock-names = "xvclk"; rockchip,camera-module-index = <0>; diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-ov5647.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-ov5647.dts index e2a72f1c53bc..2a6827a2fa77 100644 --- a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-ov5647.dts +++ b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-ov5647.dts @@ -34,7 +34,7 @@ power-domains = <&power RK3568_PD_VI>; rockchip,grf = <&grf>; - clocks = <&cru CLK_CIF_OUT>; + clocks = <&clk_cam_25m>; clock-names = "xvclk"; rockchip,camera-module-index = <0>; diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam1-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam1-imx219.dts index 4ee562777ea3..6bea1a416593 100644 --- a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam1-imx219.dts +++ b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam1-imx219.dts @@ -31,7 +31,7 @@ reset-gpios = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; - clocks = <&fake_imx219_clk>; + clocks = <&clk_cam_24m>; clock-names = "xvclk"; rockchip,camera-module-index = <1>; diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam1-ov5647.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam1-ov5647.dts index d11d1992f70c..2fae51f01207 100644 --- a/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam1-ov5647.dts +++ b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam1-ov5647.dts @@ -31,7 +31,7 @@ pwdn-gpios = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; - clocks = <&ext_cam_clk>; + clocks = <&clk_cam_25m>; clock-names = "xvclk"; rockchip,camera-module-index = <1>;