Skip to content

Commit b3424fb

Browse files
baiywtbaiywt
committed
Update for opicm5
1 parent 4bc1659 commit b3424fb

11 files changed

+1338
-1406
lines changed

‎arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-cam1.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
ov5647-1@36 {
5252
status = "okay";
5353
};
54+
55+
imx219-1@10 {
56+
status = "okay";
57+
};
5458
};
5559
};
5660
};

‎arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-cam2.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
ov5647-2@36 {
5252
status = "okay";
5353
};
54+
55+
imx219-2@10 {
56+
status = "okay";
57+
};
5458
};
5559
};
5660
};

‎arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-cam3.dts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,22 @@
3535
};
3636

3737
fragment@4 {
38-
target = <&rkisp1_vir1>;
38+
target = <&rkisp1>;
3939

4040
__overlay__ {
4141
status = "okay";
4242
};
4343
};
4444

4545
fragment@5 {
46+
target = <&rkisp1_vir1>;
47+
48+
__overlay__ {
49+
status = "okay";
50+
};
51+
};
52+
53+
fragment@6 {
4654
target = <&i2c5>;
4755

4856
__overlay__ {
@@ -51,6 +59,10 @@
5159
ov5647-3@36 {
5260
status = "okay";
5361
};
62+
63+
imx219-3@10 {
64+
status = "okay";
65+
};
5466
};
5567
};
5668
};

‎arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-cam4.dts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,22 @@
3535
};
3636

3737
fragment@4 {
38-
target = <&rkisp1_vir0>;
38+
target = <&rkisp1>;
3939

4040
__overlay__ {
4141
status = "okay";
4242
};
4343
};
4444

4545
fragment@5 {
46+
target = <&rkisp1_vir0>;
47+
48+
__overlay__ {
49+
status = "okay";
50+
};
51+
};
52+
53+
fragment@6 {
4654
target = <&i2c6>;
4755

4856
__overlay__ {
@@ -51,6 +59,10 @@
5159
ov5647-4@36 {
5260
status = "okay";
5361
};
62+
63+
imx219-4@10 {
64+
status = "okay";
65+
};
5466
};
5567
};
5668
};

‎arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-camera1.dtsi

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,17 @@
1818
#address-cells = <1>;
1919
#size-cells = <0>;
2020

21-
mipi_in_ucam0: endpoint@0 {
21+
mipidphy1_in_ucam0: endpoint@0 {
2222
reg = <0>;
2323
remote-endpoint = <&ov5647_1_out1>;
2424
data-lanes = <1 2>;
2525
};
26+
27+
mipidphy1_in_ucam1: endpoint@1 {
28+
reg = <1>;
29+
remote-endpoint = <&imx219_1_out1>;
30+
data-lanes = <1 2>;
31+
};
2632
};
2733
port@1 {
2834
reg = <1>;
@@ -48,13 +54,32 @@
4854
clocks = <&ext_cam_ov5647_clk>;
4955
clock-names = "ext_cam_ov5647_clk";
5056
pwdn-gpios = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
51-
rockchip,camera-module-index = <2>;
57+
rockchip,camera-module-index = <0>;
5258
rockchip,camera-module-facing = "back";
53-
rockchip,camera-module-name = "LMM248";
54-
rockchip,camera-module-lens-name = "YXC-M804A2";
59+
rockchip,camera-module-name = "rpi-camera-v1";
60+
rockchip,camera-module-lens-name = "default";
5561
port {
5662
ov5647_1_out1: endpoint {
57-
remote-endpoint = <&mipi_in_ucam0>;
63+
remote-endpoint = <&mipidphy1_in_ucam0>;
64+
data-lanes = <1 2>;
65+
};
66+
};
67+
};
68+
69+
imx219_1: imx219-1@10 {
70+
status = "disabled";
71+
compatible = "sony,imx219";
72+
reg = <0x10>;
73+
clocks = <&ext_cam_ov5647_clk>;
74+
clock-names = "ext_cam_ov5647_clk";
75+
pwdn-gpios = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
76+
rockchip,camera-module-index = <0>;
77+
rockchip,camera-module-facing = "back";
78+
rockchip,camera-module-name = "rpi-camera-v2";
79+
rockchip,camera-module-lens-name = "default";
80+
port {
81+
imx219_1_out1: endpoint {
82+
remote-endpoint = <&mipidphy1_in_ucam1>;
5883
data-lanes = <1 2>;
5984
};
6085
};

‎arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-camera2.dtsi

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,17 @@
1818
#address-cells = <1>;
1919
#size-cells = <0>;
2020

21-
mipi_in_ucam1: endpoint@0 {
21+
mipidphy2_in_ucam0: endpoint@0 {
2222
reg = <0>;
2323
remote-endpoint = <&ov5647_2_out1>;
2424
data-lanes = <1 2>;
2525
};
26+
27+
mipidphy2_in_ucam1: endpoint@1 {
28+
reg = <1>;
29+
remote-endpoint = <&imx219_2_out1>;
30+
data-lanes = <1 2>;
31+
};
2632
};
2733
port@1 {
2834
reg = <1>;
@@ -48,13 +54,32 @@
4854
clocks = <&ext_cam_ov5647_clk>;
4955
clock-names = "ext_cam_ov5647_clk";
5056
pwdn-gpios = <&gpio1 RK_PD1 GPIO_ACTIVE_LOW>;
51-
rockchip,camera-module-index = <2>;
57+
rockchip,camera-module-index = <1>;
5258
rockchip,camera-module-facing = "back";
53-
rockchip,camera-module-name = "LMM248";
54-
rockchip,camera-module-lens-name = "YXC-M804A2";
59+
rockchip,camera-module-name = "rpi-camera-v1";
60+
rockchip,camera-module-lens-name = "default";
5561
port {
5662
ov5647_2_out1: endpoint {
57-
remote-endpoint = <&mipi_in_ucam1>;
63+
remote-endpoint = <&mipidphy2_in_ucam0>;
64+
data-lanes = <1 2>;
65+
};
66+
};
67+
};
68+
69+
imx219_2: imx219-2@10 {
70+
status = "disabled";
71+
compatible = "sony,imx219";
72+
reg = <0x10>;
73+
clocks = <&ext_cam_ov5647_clk>;
74+
clock-names = "ext_cam_ov5647_clk";
75+
pwdn-gpios = <&gpio1 RK_PD1 GPIO_ACTIVE_LOW>;
76+
rockchip,camera-module-index = <1>;
77+
rockchip,camera-module-facing = "back";
78+
rockchip,camera-module-name = "rpi-camera-v2";
79+
rockchip,camera-module-lens-name = "default";
80+
port {
81+
imx219_2_out1: endpoint {
82+
remote-endpoint = <&mipidphy2_in_ucam1>;
5883
data-lanes = <1 2>;
5984
};
6085
};

‎arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-camera3.dtsi

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,17 @@
1616
#address-cells = <1>;
1717
#size-cells = <0>;
1818

19-
mipi_in_dcphy1: endpoint@0 {
19+
mipidcphy1_in_ucam0: endpoint@0 {
2020
reg = <0>;
2121
remote-endpoint = <&ov5647_3_out1>;
2222
data-lanes = <1 2>;
2323
};
24+
25+
mipidcphy1_in_ucam1: endpoint@1 {
26+
reg = <1>;
27+
remote-endpoint = <&imx219_3_out1>;
28+
data-lanes = <1 2>;
29+
};
2430
};
2531

2632
port@1 {
@@ -50,11 +56,30 @@
5056
pwdn-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_LOW>;
5157
rockchip,camera-module-index = <2>;
5258
rockchip,camera-module-facing = "back";
53-
rockchip,camera-module-name = "LMM248";
54-
rockchip,camera-module-lens-name = "YXC-M804A2";
59+
rockchip,camera-module-name = "rpi-camera-v1";
60+
rockchip,camera-module-lens-name = "default";
5561
port {
5662
ov5647_3_out1: endpoint {
57-
remote-endpoint = <&mipi_in_dcphy1>;
63+
remote-endpoint = <&mipidcphy1_in_ucam0>;
64+
data-lanes = <1 2>;
65+
};
66+
};
67+
};
68+
69+
imx219_3: imx219-3@10 {
70+
status = "disabled";
71+
compatible = "sony,imx219";
72+
reg = <0x10>;
73+
clocks = <&ext_cam_ov5647_clk>;
74+
clock-names = "ext_cam_ov5647_clk";
75+
pwdn-gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_LOW>;
76+
rockchip,camera-module-index = <2>;
77+
rockchip,camera-module-facing = "back";
78+
rockchip,camera-module-name = "rpi-camera-v2";
79+
rockchip,camera-module-lens-name = "default";
80+
port {
81+
imx219_3_out1: endpoint {
82+
remote-endpoint = <&mipidcphy1_in_ucam1>;
5883
data-lanes = <1 2>;
5984
};
6085
};

‎arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-camera4.dtsi

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,17 @@
1515
#address-cells = <1>;
1616
#size-cells = <0>;
1717

18-
mipi_in_dcphy0: endpoint@0 {
18+
mipidcphy0_in_ucam0: endpoint@0 {
1919
reg = <0>;
2020
remote-endpoint = <&ov5647_4_out>;
2121
data-lanes = <1 2>;
2222
};
23+
24+
mipidcphy0_in_ucam1: endpoint@1 {
25+
reg = <1>;
26+
remote-endpoint = <&imx219_4_out>;
27+
data-lanes = <1 2>;
28+
};
2329
};
2430

2531
port@1 {
@@ -47,13 +53,32 @@
4753
clocks = <&ext_cam_ov5647_clk>;
4854
clock-names = "ext_cam_ov5647_clk";
4955
pwdn-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>;
50-
rockchip,camera-module-index = <1>;
51-
rockchip,camera-module-facing = "front";
52-
rockchip,camera-module-name = "LMM248";
53-
rockchip,camera-module-lens-name = "YXC-M804A2";
56+
rockchip,camera-module-index = <3>;
57+
rockchip,camera-module-facing = "back";
58+
rockchip,camera-module-name = "rpi-camera-v1";
59+
rockchip,camera-module-lens-name = "default";
5460
port {
5561
ov5647_4_out: endpoint {
56-
remote-endpoint = <&mipi_in_dcphy0>;
62+
remote-endpoint = <&mipidcphy0_in_ucam0>;
63+
data-lanes = <1 2>;
64+
};
65+
};
66+
};
67+
68+
imx219_4: imx219-4@10 {
69+
status = "disabled";
70+
compatible = "sony,imx219";
71+
reg = <0x10>;
72+
clocks = <&ext_cam_ov5647_clk>;
73+
clock-names = "ext_cam_ov5647_clk";
74+
pwdn-gpios = <&gpio1 RK_PD3 GPIO_ACTIVE_LOW>;
75+
rockchip,camera-module-index = <3>;
76+
rockchip,camera-module-facing = "back";
77+
rockchip,camera-module-name = "rpi-camera-v2";
78+
rockchip,camera-module-lens-name = "default";
79+
port {
80+
imx219_4_out: endpoint {
81+
remote-endpoint = <&mipidcphy0_in_ucam1>;
5782
data-lanes = <1 2>;
5883
};
5984
};

‎arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
fan: pwm-fan {
166166
compatible = "pwm-fan";
167167
#cooling-cells = <2>;
168-
pwms = <&pwm13 0 50000 0>;
168+
pwms = <&pwm13 0 20000000 0>;
169169
cooling-levels = <0 50 100 150 200 255>;
170170
rockchip,temp-trips = <
171171
50000 1
@@ -681,6 +681,14 @@
681681
};
682682

683683
&isp0_mmu {
684+
status = "okay";
685+
};
686+
687+
&rkisp1 {
688+
status = "okay";
689+
};
690+
691+
&isp1_mmu {
684692
status = "okay";
685693
};
686694

0 commit comments

Comments
 (0)