Skip to content

Commit bf6ad04

Browse files
wenleoZhengShunQian
authored andcommitted
arm: dts: rk3288-evb-rk808-linux: support isp1&ov13850 node
Delete cif_isp10 and all cif_isp10_cameras node Change-Id: Ied1f36e6392eaa7d0cf32a491bb42072a9dd6233 Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
1 parent 24f079c commit bf6ad04

1 file changed

Lines changed: 47 additions & 42 deletions

File tree

arch/arm/boot/dts/rk3288-evb-rk808-linux.dts

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
/dts-v1/;
4242
#include "rk3288-evb.dtsi"
4343
#include "rk3288-linux.dtsi"
44+
#include "rk3288-rkisp1.dtsi"
4445

4546
/ {
4647
compatible = "rockchip,rk3288-evb-rk808-linux", "rockchip,rk3288";
@@ -490,48 +491,65 @@
490491
&i2c3 {
491492
status = "okay";
492493

493-
camera0: camera-module@10 {
494+
ov13850: ov13850@10 {
495+
compatible = "ovti,ov13850";
494496
status = "okay";
495-
compatible = "omnivision,ov13850-v4l2-i2c-subdev";
496497
reg = <0x10>;
497-
device_type = "v4l2-i2c-subdev";
498498
clocks = <&cru SCLK_VIP_OUT>;
499-
clock-names = "clk_cif_out";
500-
pinctrl-names = "rockchip,camera_default",
501-
"rockchip,camera_sleep";
502-
pinctrl-0 = <&cam0_default_pins>;
503-
pinctrl-1 = <&cam0_sleep_pins>;
504-
rockchip,pd-gpio = <&gpio2 15 GPIO_ACTIVE_LOW>;
505-
rockchip,pwr-gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;
506-
rockchip,rst-gpio = <&gpio7 21 GPIO_ACTIVE_LOW>;
507-
rockchip,camera-module-mclk-name = "clk_cif_out";
508-
rockchip,camera-module-facing = "back";
509-
rockchip,camera-module-name = "cmk-cb0695-fv1";
510-
rockchip,camera-module-len-name = "lg9569a2";
511-
rockchip,camera-module-fov-h = "66.0";
512-
rockchip,camera-module-fov-v = "50.1";
513-
rockchip,camera-module-orientation = <0>;
514-
rockchip,camera-module-iq-flip = <0>;
515-
rockchip,camera-module-iq-mirror = <0>;
516-
rockchip,camera-module-flip = <1>;
517-
rockchip,camera-module-mirror = <0>;
518-
rockchip,camera-module-defrect0 = <2112 1568 0 0 2112 1568>;
519-
rockchip,camera-module-defrect1 = <4224 3136 0 0 4224 3136>;
520-
rockchip,camera-module-defrect3 = <3264 2448 0 0 3264 2448>;
521-
rockchip,camera-module-flash-support = <1>;
522-
rockchip,camera-module-mipi-dphy-index = <0>;
499+
clock-names = "xvclk";
500+
501+
reset-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>;
502+
pwdn-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
503+
504+
port {
505+
cam_out: endpoint {
506+
remote-endpoint = <&mipi_in_cam>;
507+
data-lanes = <1 2>;
508+
};
509+
};
523510
};
524511
};
525512

526-
&cif_isp0 {
527-
rockchip,camera-modules-attached = <&camera0>;
513+
&isp {
528514
status = "okay";
515+
516+
port {
517+
isp_mipi_in: endpoint {
518+
remote-endpoint = <&dphy_rx0_out>;
519+
};
520+
};
529521
};
530522

531523
&isp_mmu {
532524
status = "okay";
533525
};
534526

527+
&mipi_phy_rx0 {
528+
status = "okay";
529+
530+
ports {
531+
#address-cells = <1>;
532+
#size-cells = <0>;
533+
534+
port@0 {
535+
reg = <0>;
536+
537+
mipi_in_cam: endpoint {
538+
remote-endpoint = <&cam_out>;
539+
data-lanes = <1 2>;
540+
};
541+
};
542+
543+
port@1 {
544+
reg = <1>;
545+
546+
dphy_rx0_out: endpoint {
547+
remote-endpoint = <&isp_mipi_in>;
548+
};
549+
};
550+
};
551+
};
552+
535553
&rga {
536554
status = "okay";
537555
};
@@ -566,17 +584,4 @@
566584
rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>;
567585
};
568586
};
569-
570-
cam_pins {
571-
cam0_default_pins: cam0-default-pins {
572-
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>,
573-
<2 15 RK_FUNC_GPIO &pcfg_pull_none>,
574-
<2 11 RK_FUNC_1 &pcfg_pull_none>;
575-
};
576-
cam0_sleep_pins: cam0-sleep-pins {
577-
rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>,
578-
<2 15 RK_FUNC_GPIO &pcfg_pull_none>,
579-
<2 11 RK_FUNC_GPIO &pcfg_pull_none>;
580-
};
581-
};
582587
};

0 commit comments

Comments
 (0)