From 0a894cc356c4a0600897a3ef8c1cf184740e7db5 Mon Sep 17 00:00:00 2001 From: "Dalon.zhang" Date: Mon, 13 Nov 2017 18:13:37 +0800 Subject: [PATCH] arm64: dts: rk3399-sapphire-excavator-linux: support ov4689&ov13850 Change-Id: Iadcfa66afb1de8c949dc453fdafc980975d1a4f3 Signed-off-by: Zhang Yunlong --- .../arm64/boot/dts/rockchip/rk3399-linux.dtsi | 3 +- .../rk3399-sapphire-excavator-linux.dts | 72 ++++++++++++++++++- 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi index 956300a975ee..07a20146f2d3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -200,7 +200,8 @@ isp_prelight: isp-prelight { /* ISP_PRELIGHTTRIG */ - rockchip,pins = <1 4 RK_FUNC_1 &pcfg_pull_none>; + /* used as pwrdn in excavator Evb_ExtBoard_MipiCam */ + /* rockchip,pins = <1 4 RK_FUNC_1 &pcfg_pull_none>; */ }; isp_flash_trigger_as_gpio: isp-flash-trigger-as-gpio { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts index 7d190a0be053..363a27cba883 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -153,7 +153,8 @@ }; &cif_isp0 { - rockchip,camera-modules-attached = <&camera0 &camera1>; + rockchip,camera-modules-attached = + <&camera0 &camera1 &camera2 &camera3>; status = "okay"; }; @@ -162,7 +163,7 @@ }; &cif_isp1 { - rockchip,camera-modules-attached = <&camera2>; + rockchip,camera-modules-attached = <&camera4>; status = "okay"; }; @@ -298,12 +299,77 @@ rockchip,camera-module-mipi-dphy-index = <0>; }; + camera2: camera-module@10 { + status = "okay"; + compatible = "omnivision,ov13850-v4l2-i2c-subdev"; + reg = < 0x10 >; + device_type = "v4l2-i2c-subdev"; + clocks = <&cru SCLK_CIF_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 = <&gpio1 4 GPIO_ACTIVE_LOW>; + //rockchip,pwr-gpio = <&gpio2 10 GPIO_ACTIVE_HIGH>; + /* mipi switch control */ + rockchip,rst-gpio = <&gpio2 10 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>; + }; + + camera3: camera-module@36 { + status = "okay"; + compatible = "omnivision,ov4689-v4l2-i2c-subdev"; + reg = <0x36>; + device_type = "v4l2-i2c-subdev"; + clocks = <&cru SCLK_CIF_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 = <&gpio3 4 GPIO_ACTIVE_LOW>; + //rockchip,pwr-gpio = <&gpio3 13 0>; + /* mipi switch control*/ + rockchip,rst-gpio = <&gpio2 10 GPIO_ACTIVE_LOW>; + rockchip,camera-module-mclk-name = "clk_cif_out"; + rockchip,camera-module-facing = "back"; + rockchip,camera-module-name = "LA6111PA"; + rockchip,camera-module-len-name = "YM6011P"; + rockchip,camera-module-fov-h = "116"; + rockchip,camera-module-fov-v = "61"; + rockchip,camera-module-orientation = <0>; + rockchip,camera-module-iq-flip = <0>; + rockchip,camera-module-iq-mirror = <0>; + rockchip,camera-module-flip = <0>; + rockchip,camera-module-mirror = <1>; + + rockchip,camera-module-defrect0 = <2688 1520 0 0 2688 1520>; + rockchip,camera-module-flash-support = <0>; + rockchip,camera-module-mipi-dphy-index = <0>; + }; }; &i2c4 { status = "okay"; - camera2: camera-module@2 { + camera4: camera-module@2 { status = "okay"; compatible = "adi,adv7181-v4l2-i2c-subdev"; reg = < 0x21 >;