shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: rv1126: modify isp and ispp node for support multi virtual device

Browse Source 
Change-Id: Id4254a21e48409b47fb394086582766c13c6ed29
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2020-08-07 16:08:57 +08:00
parent e0c7b8e444
commit 56704fe181
10 changed files with 147 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm/boot/dts/rv1109-38-v10-spi-nand.dts
View File

@@ -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>;
};
};
};

2
arch/arm/boot/dts/rv1109-evb-ddr3-v12-facial-gate.dts
View File

@@ -111,7 +111,7 @@
status = "disabled";
};
&rkisp {
&rkisp_vir0 {
ports {
port@0 {
isp_in: endpoint@0 {

30
arch/arm/boot/dts/rv1126-38x38-v10-spi-nor.dts
View File

@@ -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>;
};
};
};

32
arch/arm/boot/dts/rv1126-ai-cam.dtsi
View File

@@ -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 {

32
arch/arm/boot/dts/rv1126-evb-v10.dtsi
View File

@@ -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 {

8
arch/arm/boot/dts/rv1126-ipc.dtsi
View File

@@ -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";
};

30
arch/arm/boot/dts/rv1126-ipc2-ddr3-v10.dts
View File

@@ -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>;
};
};
};

38
arch/arm/boot/dts/rv1126-sphericalipc-ddr3-v10.dts
View File

@@ -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>;

2
arch/arm/boot/dts/rv1126-thunder-boot.dtsi
View File

@@ -102,6 +102,6 @@
status = "disabled";
};
&rkisp {
&rkisp_vir0 {
memory-region-thunderboot = <&rkisp_thunderboot>;
};

114
arch/arm/boot/dts/rv1126.dtsi
View File

@@ -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>;