diff --git a/arch/arm/boot/dts/rv1109-38-v10-spi-nand.dts b/arch/arm/boot/dts/rv1109-38-v10-spi-nand.dts index 7f812f7b2729..1c4fad3e2033 100644 --- a/arch/arm/boot/dts/rv1109-38-v10-spi-nand.dts +++ b/arch/arm/boot/dts/rv1109-38-v10-spi-nand.dts @@ -201,13 +201,10 @@ vccio7-supply = <&vcc3v3_sys>; }; -&rkisp { +&rkisp_vir0 { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; #address-cells = <1>; @@ -218,31 +215,6 @@ remote-endpoint = <&csidphy0_out>; }; }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - isp_out: endpoint@1 { - reg = <1>; - remote-endpoint = <&ispp_in>; - }; - }; - }; -}; - -&rkispp { - status = "okay"; - - port { - #address-cells = <1>; - #size-cells = <0>; - - ispp_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&isp_out>; - }; }; }; diff --git a/arch/arm/boot/dts/rv1109-evb-ddr3-v12-facial-gate.dts b/arch/arm/boot/dts/rv1109-evb-ddr3-v12-facial-gate.dts index 7b9337c988f7..696753318e4f 100644 --- a/arch/arm/boot/dts/rv1109-evb-ddr3-v12-facial-gate.dts +++ b/arch/arm/boot/dts/rv1109-evb-ddr3-v12-facial-gate.dts @@ -111,7 +111,7 @@ status = "disabled"; }; -&rkisp { +&rkisp_vir0 { ports { port@0 { isp_in: endpoint@0 { diff --git a/arch/arm/boot/dts/rv1126-38x38-v10-spi-nor.dts b/arch/arm/boot/dts/rv1126-38x38-v10-spi-nor.dts index 1f9c007aa104..7a481f45b9df 100644 --- a/arch/arm/boot/dts/rv1126-38x38-v10-spi-nor.dts +++ b/arch/arm/boot/dts/rv1126-38x38-v10-spi-nor.dts @@ -282,13 +282,10 @@ pinctrl-0 = <&pwm3m0_pins_pull_down>; }; -&rkisp { +&rkisp_vir0 { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; #address-cells = <1>; @@ -299,31 +296,6 @@ remote-endpoint = <&csidphy0_out>; }; }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - isp_out: endpoint@1 { - reg = <1>; - remote-endpoint = <&ispp_in>; - }; - }; - }; -}; - -&rkispp { - status = "okay"; - - port { - #address-cells = <1>; - #size-cells = <0>; - - ispp_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&isp_out>; - }; }; }; diff --git a/arch/arm/boot/dts/rv1126-ai-cam.dtsi b/arch/arm/boot/dts/rv1126-ai-cam.dtsi index 46a4ced3e741..4d3ae9f04fd1 100644 --- a/arch/arm/boot/dts/rv1126-ai-cam.dtsi +++ b/arch/arm/boot/dts/rv1126-ai-cam.dtsi @@ -248,11 +248,12 @@ &rkisp { status = "okay"; +}; + +&rkisp_vir0 { + status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; #address-cells = <1>; @@ -263,17 +264,6 @@ remote-endpoint = <&csidphy0_out>; }; }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - isp_out: endpoint@1 { - reg = <1>; - remote-endpoint = <&ispp_in>; - }; - }; }; }; @@ -283,16 +273,12 @@ &rkispp { status = "okay"; + /* the max input w h and fps of mulit sensor */ + //max-input = <2688 1520 30>; +}; - port { - #address-cells = <1>; - #size-cells = <0>; - - ispp_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&isp_out>; - }; - }; +&rkispp_vir0 { + status = "okay"; }; &rkispp_mmu { diff --git a/arch/arm/boot/dts/rv1126-evb-v10.dtsi b/arch/arm/boot/dts/rv1126-evb-v10.dtsi index 921f1fe37caa..ad81ed7e7102 100644 --- a/arch/arm/boot/dts/rv1126-evb-v10.dtsi +++ b/arch/arm/boot/dts/rv1126-evb-v10.dtsi @@ -1157,11 +1157,12 @@ &rkisp { status = "okay"; +}; + +&rkisp_vir0 { + status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; #address-cells = <1>; @@ -1172,17 +1173,6 @@ remote-endpoint = <&csidphy0_out>; }; }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - isp_out: endpoint@1 { - reg = <1>; - remote-endpoint = <&ispp_in>; - }; - }; }; }; @@ -1192,16 +1182,12 @@ &rkispp { status = "okay"; + /* the max input w h and fps of mulit sensor */ + //max-input = <2688 1520 30>; +}; - port { - #address-cells = <1>; - #size-cells = <0>; - - ispp_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&isp_out>; - }; - }; +&rkispp_vir0 { + status = "okay"; }; &rkispp_mmu { diff --git a/arch/arm/boot/dts/rv1126-ipc.dtsi b/arch/arm/boot/dts/rv1126-ipc.dtsi index 4995d7f6817b..04e9a22ae208 100644 --- a/arch/arm/boot/dts/rv1126-ipc.dtsi +++ b/arch/arm/boot/dts/rv1126-ipc.dtsi @@ -145,6 +145,10 @@ status = "okay"; }; +&rkisp_vir0 { + status = "okay"; +}; + &rkisp_mmu { status = "disabled"; }; @@ -153,6 +157,10 @@ status = "okay"; }; +&rkispp_vir0 { + status = "okay"; +}; + &rkispp_mmu { status = "okay"; }; diff --git a/arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts b/arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts index 2ca44d47e1f8..64edd7d60d44 100644 --- a/arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts +++ b/arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts @@ -417,12 +417,10 @@ vccio7-supply = <&vcc_1v8>; }; -&rkisp { +&rkisp_vir0 { + status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; #address-cells = <1>; @@ -433,30 +431,6 @@ remote-endpoint = <&csidphy0_out>; }; }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - isp_out: endpoint@1 { - reg = <1>; - remote-endpoint = <&ispp_in>; - }; - }; - }; -}; - -&rkispp { - - port { - #address-cells = <1>; - #size-cells = <0>; - - ispp_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&isp_out>; - }; }; }; diff --git a/arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts b/arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts index c572b42ab5a5..a955d18b3f58 100644 --- a/arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts +++ b/arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts @@ -429,13 +429,10 @@ vccio7-supply = <&vcc_1v8>; }; -&rkisp { +&rkisp_vir0 { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; #address-cells = <1>; @@ -446,42 +443,9 @@ remote-endpoint = <&csidphy0_out>; }; }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - isp_out: endpoint@1 { - reg = <1>; - remote-endpoint = <&ispp_in>; - }; - }; }; }; -&rkisp_mmu { - status = "disabled"; -}; - -&rkispp { - status = "okay"; - - port { - #address-cells = <1>; - #size-cells = <0>; - - ispp_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&isp_out>; - }; - }; -}; - -&rkispp_mmu { - status = "okay"; -}; - &saradc { status = "okay"; vref-supply = <&vcc_1v8>; diff --git a/arch/arm/boot/dts/rv1126-thunder-boot.dtsi b/arch/arm/boot/dts/rv1126-thunder-boot.dtsi index 0c94ef47f86e..f52ad1091b5d 100644 --- a/arch/arm/boot/dts/rv1126-thunder-boot.dtsi +++ b/arch/arm/boot/dts/rv1126-thunder-boot.dtsi @@ -102,6 +102,6 @@ status = "disabled"; }; -&rkisp { +&rkisp_vir0 { memory-region-thunderboot = <&rkisp_thunderboot>; }; diff --git a/arch/arm/boot/dts/rv1126.dtsi b/arch/arm/boot/dts/rv1126.dtsi index be57a6d4aecb..58db6f4158e0 100644 --- a/arch/arm/boot/dts/rv1126.dtsi +++ b/arch/arm/boot/dts/rv1126.dtsi @@ -1807,6 +1807,72 @@ status = "disabled"; }; + rkisp_vir0: rkisp-vir0 { + compatible = "rockchip,rv1126-rkisp-vir"; + rockchip,hw = <&rkisp>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + isp0_out: endpoint@1 { + reg = <1>; + remote-endpoint = <&ispp0_in>; + }; + }; + }; + }; + + rkisp_vir1: rkisp-vir1 { + compatible = "rockchip,rv1126-rkisp-vir"; + rockchip,hw = <&rkisp>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + isp1_out: endpoint@1 { + reg = <1>; + remote-endpoint = <&ispp1_in>; + }; + }; + }; + }; + + rkisp_vir2: rkisp-vir2 { + compatible = "rockchip,rv1126-rkisp-vir"; + rockchip,hw = <&rkisp>; + status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + isp2_out: endpoint@1 { + reg = <1>; + remote-endpoint = <&ispp2_in>; + }; + }; + }; + }; + rkispp: rkispp@ffb60000 { compatible = "rockchip,rv1126-rkispp"; reg = <0xffb60000 0x20000>; @@ -1840,6 +1906,54 @@ status = "disabled"; }; + rkispp_vir0: rkispp-vir0 { + compatible = "rockchip,rv1126-rkispp-vir"; + rockchip,hw = <&rkispp>; + status = "disabled"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + ispp0_in: endpoint@0 { + reg = <0>; + remote-endpoint = <&isp0_out>; + }; + }; + }; + + rkispp_vir1: rkispp-vir1 { + compatible = "rockchip,rv1126-rkispp-vir"; + rockchip,hw = <&rkispp>; + status = "disabled"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + ispp1_in: endpoint@0 { + reg = <0>; + remote-endpoint = <&isp1_out>; + }; + }; + }; + + rkispp_vir2: rkispp-vir2 { + compatible = "rockchip,rv1126-rkispp-vir"; + rockchip,hw = <&rkispp>; + status = "disabled"; + + port { + #address-cells = <1>; + #size-cells = <0>; + + ispp2_in: endpoint@0 { + reg = <0>; + remote-endpoint = <&isp2_out>; + }; + }; + }; + rkvdec: rkvdec@ffb80000 { compatible = "rockchip,rkv-decoder-v1"; reg = <0xffb80000 0x400>;