Skip to content

Commit 24ef89c

Browse files
topdjgodjamess-huang
authored andcommitted
both support imx219 and ov5647
Change-Id: Ia560093e8bab49aca27a5eba0de59e83082f1356 Signed-off-by: Jungchi_Liao <Jungchi_Liao@asus.com> Reviewed-on: https://tp-biosrd-v02/gerrit/80085 Reviewed-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com> Tested-by: Jamess Huang(黃以民) <Jamess_Huang@asus.com>
1 parent 4c53e22 commit 24ef89c

1 file changed

Lines changed: 54 additions & 3 deletions

File tree

arch/arm/boot/dts/rk3288-miniarm.dts

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
regulator-max-microvolt = <1000000>;
219219
regulator-name = "vdd_logic";
220220
};
221-
221+
/*
222222
vcc_cam: vcc-cam {
223223
compatible = "regulator-fixed";
224224
regulator-name = "vcc_cam";
@@ -240,10 +240,11 @@
240240
regulator-always-on;
241241
regulator-boot-on;
242242
};
243+
*/
243244
};
244245

245246
&cif_isp0 {
246-
rockchip,camera-modules-attached = <&camera0>;
247+
rockchip,camera-modules-attached = <&camera0 &camera1>;
247248
status = "okay";
248249
};
249250

@@ -527,6 +528,42 @@
527528
rockchip,camera-module-mipi-dphy-index = <0>;
528529
};
529530

531+
camera1: camera-module@10 {
532+
status = "okay";
533+
compatible = "sony,imx219-v4l2-i2c-subdev";
534+
reg = <0x10>;
535+
device_type = "v4l2-i2c-subdev";
536+
537+
clocks = <&cru SCLK_VIP_OUT>;
538+
clock-names = "clk_cif_out";
539+
540+
pinctrl-names = "rockchip,camera_default",
541+
"rockchip,camera_sleep";
542+
pinctrl-0 = <&cam0_default_pins>;
543+
pinctrl-1 = <&cam0_sleep_pins>;
544+
545+
rockchip,pd-gpio = <&gpio2 0 GPIO_ACTIVE_LOW>;
546+
547+
rockchip,camera-module-mclk-name = "clk_cif_out";
548+
rockchip,camera-module-regulator-names = "vcc33_mipi";
549+
rockchip,camera-module-regulator-voltages = <3300000>;
550+
rockchip,camera-module-dovdd = "1.8v";
551+
rockchip,camera-module-facing = "back";
552+
rockchip,camera-module-name = "cmk-cb0695-fv1";
553+
rockchip,camera-module-len-name = "lg9569a2";
554+
rockchip,camera-module-fov-h = "66.0";
555+
rockchip,camera-module-fov-v = "50.1";
556+
rockchip,camera-module-orientation = <0>;
557+
rockchip,camera-module-iq-flip = <0>;
558+
rockchip,camera-module-iq-mirror = <0>;
559+
rockchip,camera-module-flip = <0>;
560+
rockchip,camera-module-mirror = <0>;
561+
562+
/* resolution.w, resolution.h, defrect.left, defrect.top, defrect.w, defrect.h */
563+
rockchip,camera-module-defrect0 = <3264 2448 0 0 3264 2448>;
564+
rockchip,camera-module-flash-support = <0>;
565+
rockchip,camera-module-mipi-dphy-index = <0>;
566+
};
530567
m24c08@50 {
531568
compatible = "at,24c08";
532569
reg = <0x50>;
@@ -803,7 +840,7 @@
803840
};
804841
};
805842

806-
843+
/*
807844
cam_pins {
808845
cam_mclk: cam-mclk {
809846
rockchip,pins = <2 11 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -813,6 +850,20 @@
813850
rockchip,pins = <2 0 RK_FUNC_GPIO &pcfg_pull_none>;
814851
};
815852
};
853+
*/
854+
cam_pins {
855+
cam0_default_pins: cam0-default-pins {
856+
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>,
857+
<2 0 RK_FUNC_GPIO &pcfg_pull_none>,
858+
<2 11 RK_FUNC_1 &pcfg_pull_none>;
859+
};
860+
861+
cam0_sleep_pins: cam0-sleep-pins {
862+
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>,
863+
<2 0 RK_FUNC_GPIO &pcfg_pull_none>,
864+
<2 11 RK_FUNC_GPIO &pcfg_pull_none>;
865+
};
866+
};
816867
};
817868

818869
&dmc {

0 commit comments

Comments
 (0)