From 43b602d260e538f999f6a8a73b7531697751f49b Mon Sep 17 00:00:00 2001 From: Maxim Paymushkin Date: Wed, 27 Nov 2024 11:55:35 +0100 Subject: [PATCH] patch: kernel: rk35xx-vendor-6.1: adakta-smarc: upd camera --- .../dt/rk3568-adakta-smarc-base-camera.dtsi | 7 +++++++ .../overlay/adakta-smarc-cam0-imx219.dts | 10 ++-------- .../overlay/adakta-smarc-cam1-imx219.dts | 5 ++--- 3 files changed, 11 insertions(+), 11 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 bd64fb0231cb..07c5ebf74c50 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 @@ -21,6 +21,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-smarc-cam0-imx219.dts b/patch/kernel/rk35xx-vendor-6.1/overlay/adakta-smarc-cam0-imx219.dts index a5f5a07c3450..71b0302c3c21 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 @@ -1,8 +1,6 @@ /dts-v1/; /plugin/; -#include -#include #include #include @@ -29,13 +27,9 @@ pinctrl-names = "default"; pinctrl-0 = <&cif_clk>, <&cam0_powerdown>; - // powerdown in driver - reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; - power-domains = <&power RK3568_PD_VI>; - rockchip,grf = <&grf>; - - clocks = <&cru CLK_CIF_OUT>; + clocks = <&fake_imx219_clk>; 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 8a70ece6ff38..4ee562777ea3 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 @@ -29,10 +29,9 @@ pinctrl-names = "default"; pinctrl-0 = <&cam1_powerdown>; - // powerdown in driver - reset-gpios = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; - clocks = <&ext_cam_clk>; + clocks = <&fake_imx219_clk>; clock-names = "xvclk"; rockchip,camera-module-index = <1>;