diff --git a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts index 86c532ea161c..d0487f8b794f 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts @@ -41,6 +41,7 @@ /dts-v1/; #include "rk3288-evb.dtsi" #include "rk3288-linux.dtsi" +#include "rk3288-rkisp1.dtsi" / { compatible = "rockchip,rk3288-evb-rk808-linux", "rockchip,rk3288"; @@ -490,48 +491,65 @@ &io_domains { &i2c3 { status = "okay"; - camera0: camera-module@10 { + ov13850: ov13850@10 { + compatible = "ovti,ov13850"; status = "okay"; - compatible = "omnivision,ov13850-v4l2-i2c-subdev"; reg = <0x10>; - device_type = "v4l2-i2c-subdev"; clocks = <&cru SCLK_VIP_OUT>; - clock-names = "clk_cif_out"; - pinctrl-names = "rockchip,camera_default", - "rockchip,camera_sleep"; - pinctrl-0 = <&cam0_default_pins>; - pinctrl-1 = <&cam0_sleep_pins>; - rockchip,pd-gpio = <&gpio2 15 GPIO_ACTIVE_LOW>; - rockchip,pwr-gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>; - rockchip,rst-gpio = <&gpio7 21 GPIO_ACTIVE_LOW>; - rockchip,camera-module-mclk-name = "clk_cif_out"; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "cmk-cb0695-fv1"; - rockchip,camera-module-len-name = "lg9569a2"; - rockchip,camera-module-fov-h = "66.0"; - rockchip,camera-module-fov-v = "50.1"; - rockchip,camera-module-orientation = <0>; - rockchip,camera-module-iq-flip = <0>; - rockchip,camera-module-iq-mirror = <0>; - rockchip,camera-module-flip = <1>; - rockchip,camera-module-mirror = <0>; - rockchip,camera-module-defrect0 = <2112 1568 0 0 2112 1568>; - rockchip,camera-module-defrect1 = <4224 3136 0 0 4224 3136>; - rockchip,camera-module-defrect3 = <3264 2448 0 0 3264 2448>; - rockchip,camera-module-flash-support = <1>; - rockchip,camera-module-mipi-dphy-index = <0>; + clock-names = "xvclk"; + + reset-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>; + pwdn-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>; + + port { + cam_out: endpoint { + remote-endpoint = <&mipi_in_cam>; + data-lanes = <1 2>; + }; + }; }; }; -&cif_isp0 { - rockchip,camera-modules-attached = <&camera0>; +&isp { status = "okay"; + + port { + isp_mipi_in: endpoint { + remote-endpoint = <&dphy_rx0_out>; + }; + }; }; &isp_mmu { status = "okay"; }; +&mipi_phy_rx0 { + status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + mipi_in_cam: endpoint { + remote-endpoint = <&cam_out>; + data-lanes = <1 2>; + }; + }; + + port@1 { + reg = <1>; + + dphy_rx0_out: endpoint { + remote-endpoint = <&isp_mipi_in>; + }; + }; + }; +}; + &rga { status = "okay"; }; @@ -566,17 +584,4 @@ mpu6050_irq_gpio: mpu6050-irq-gpio { rockchip,pins = <8 0 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - - cam_pins { - cam0_default_pins: cam0-default-pins { - rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>, - <2 15 RK_FUNC_GPIO &pcfg_pull_none>, - <2 11 RK_FUNC_1 &pcfg_pull_none>; - }; - cam0_sleep_pins: cam0-sleep-pins { - rockchip,pins = <0 17 RK_FUNC_GPIO &pcfg_pull_none>, - <2 15 RK_FUNC_GPIO &pcfg_pull_none>, - <2 11 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; };