Skip to content

Commit 09a1480

Browse files
leebobyleeboby
committed
Update for Oragne Pi CM5 Tablet v1.1
1 parent b3424fb commit 09a1480

37 files changed

+11715
-1282
lines changed

‎arch/arm64/boot/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
Image
33
Image.gz
44
vmlinuz*
5+
*.scr

‎arch/arm64/boot/dts/rockchip/overlay/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
4040
rk3588-uart4-m0.dtbo \
4141
rk3588-uart4-m2.dtbo \
4242
rk3588-uart6-m1.dtbo \
43+
rk3588-uart6-m2.dtbo \
4344
rk3588-uart7-m2.dtbo \
4445
rk3588-uart8-m1.dtbo \
4546
rk3588-can0-m0.dtbo \
@@ -76,6 +77,7 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
7677
rk3588-spi0-m2-cs1-spidev.dtbo \
7778
rk3588-spi0-m2-cs0-cs1-spidev.dtbo \
7879
rk3588-spi1-m1-cs0-spidev.dtbo \
80+
rk3588-spi1-m2-cs0-spidev.dtbo \
7981
rk3588-spi4-m0-cs1-spidev.dtbo \
8082
rk3588-spi4-m1-cs0-spidev.dtbo \
8183
rk3588-spi4-m1-cs1-spidev.dtbo \
@@ -95,7 +97,7 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
9597
rk3588-opicm5-tablet-cam2.dtbo \
9698
rk3588-opicm5-tablet-cam3.dtbo \
9799
rk3588-opicm5-tablet-lcd.dtbo \
98-
rk3588-opicm5-tablet-disable-led.dtbo
100+
rk3588-opicm5-tablet-disable-leds.dtbo
99101

100102
scr-$(CONFIG_ARCH_ROCKCHIP) += \
101103
rk3588-fixup.scr

‎arch/arm64/boot/dts/rockchip/overlay/rk3588-fixup.scr

-2.69 KB
Binary file not shown.

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@
4848
__overlay__ {
4949
status = "okay";
5050

51-
ov5647@36 {
51+
ov5647-cam2@36 {
52+
status = "okay";
53+
};
54+
55+
imx219-cam2@10 {
5256
status = "okay";
5357
};
5458
};

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@
4848
__overlay__ {
4949
status = "okay";
5050

51-
ov5647-1@36 {
51+
ov5647-cam3@36 {
52+
status = "okay";
53+
};
54+
55+
imx219-cam3@10 {
5256
status = "okay";
5357
};
5458
};

‎arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-disable-led.dts renamed to ‎arch/arm64/boot/dts/rockchip/overlay/rk3588-opicm5-tablet-disable-leds.dts

File renamed without changes.

‎arch/arm64/boot/dts/rockchip/overlay/rk3588-spi1-m2-cs0-spidev.dts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/dts-v1/;
2+
/plugin/;
3+
4+
/ {
5+
fragment@0 {
6+
target = <&spi1>;
7+
8+
__overlay__ {
9+
status = "okay";
10+
#address-cells = <1>;
11+
#size-cells = <0>;
12+
pinctrl-names = "default";
13+
pinctrl-0 = <&spi1m2_cs0 &spi1m2_pins>;
14+
max-freq = <50000000>;
15+
16+
spidev@0 {
17+
compatible = "rockchip,spidev";
18+
status = "okay";
19+
reg = <0>;
20+
spi-max-frequency = <50000000>;
21+
};
22+
};
23+
};
24+
};

‎arch/arm64/boot/dts/rockchip/overlay/rk3588-uart6-m2.dts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/dts-v1/;
2+
/plugin/;
3+
4+
/ {
5+
fragment@0 {
6+
target = <&uart6>;
7+
8+
__overlay__ {
9+
status = "okay";
10+
pinctrl-0 = <&uart6m2_xfer>;
11+
};
12+
};
13+
};

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

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

18-
mipi_in_dcphy0: endpoint@0 {
18+
mipi_in_dcphy_0: endpoint@0 {
1919
reg = <0>;
20-
remote-endpoint = <&ov5647_out>;
20+
remote-endpoint = <&ov5647_out_1>;
21+
data-lanes = <1 2>;
22+
};
23+
24+
mipi_in_dcphy_1: endpoint@1 {
25+
reg = <0>;
26+
remote-endpoint = <&imx219_out_1>;
2127
data-lanes = <1 2>;
2228
};
2329
};
@@ -38,7 +44,7 @@
3844
&i2c6 {
3945
status = "okay";
4046

41-
ov5647: ov5647@36 {
47+
ov5647_cam2: ov5647-cam2@36 {
4248
status = "disabled";
4349
compatible = "ovti,ov5647";
4450
reg = <0x36>;
@@ -47,15 +53,34 @@
4753
pwdn-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>;
4854
rockchip,camera-module-index = <1>;
4955
rockchip,camera-module-facing = "front";
50-
rockchip,camera-module-name = "LMM248";
51-
rockchip,camera-module-lens-name = "YXC-M804A2";
56+
rockchip,camera-module-name = "rpi-camera-v1";
57+
rockchip,camera-module-lens-name = "default";
5258
port {
53-
ov5647_out: endpoint {
54-
remote-endpoint = <&mipi_in_dcphy0>;
59+
ov5647_out_1: endpoint {
60+
remote-endpoint = <&mipi_in_dcphy_0>;
5561
data-lanes = <1 2>;
5662
};
5763
};
5864
};
65+
66+
imx219_cam2: imx219-cam2@10 {
67+
status = "disabled";
68+
compatible = "sony,imx219";
69+
reg = <0x10>;
70+
clocks = <&ext_cam_ov5647_clk>;
71+
clock-names = "ext_cam_ov5647_clk";
72+
pwdn-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>;
73+
rockchip,camera-module-index = <0>;
74+
rockchip,camera-module-facing = "back";
75+
rockchip,camera-module-name = "rpi-camera-v2";
76+
rockchip,camera-module-lens-name = "default";
77+
port {
78+
imx219_out_1: endpoint {
79+
remote-endpoint = <&mipi_in_dcphy_1>;
80+
data-lanes = <1 2>;
81+
};
82+
};
83+
};
5984
};
6085

6186
&mipi0_csi2 {

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

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,15 @@
1616
#address-cells = <1>;
1717
#size-cells = <0>;
1818

19-
mipi_in_dcphy1: endpoint@0 {
19+
mipi_in_dcphy0_cam3: endpoint@0 {
2020
reg = <0>;
21-
remote-endpoint = <&ov5647_out1>;
21+
remote-endpoint = <&ov5647_out_cam3>;
22+
data-lanes = <1 2>;
23+
};
24+
25+
mipi_in_dcphy1_cam3: endpoint@1 {
26+
reg = <0>;
27+
remote-endpoint = <&imx219_out_cam3>;
2228
data-lanes = <1 2>;
2329
};
2430
};
@@ -39,7 +45,7 @@
3945
&i2c7 {
4046
status = "okay";
4147

42-
ov5647_1: ov5647-1@36 {
48+
ov5647_cam3: ov5647-cam3@36 {
4349
status = "disabled";
4450
compatible = "ovti,ov5647";
4551
reg = <0x36>;
@@ -48,15 +54,34 @@
4854
pwdn-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
4955
rockchip,camera-module-index = <2>;
5056
rockchip,camera-module-facing = "back";
51-
rockchip,camera-module-name = "LMM248";
52-
rockchip,camera-module-lens-name = "YXC-M804A2";
57+
rockchip,camera-module-name = "rpi-camera-v1";
58+
rockchip,camera-module-lens-name = "default";
5359
port {
54-
ov5647_out1: endpoint {
55-
remote-endpoint = <&mipi_in_dcphy1>;
60+
ov5647_out_cam3: endpoint {
61+
remote-endpoint = <&mipi_in_dcphy0_cam3>;
5662
data-lanes = <1 2>;
5763
};
5864
};
5965
};
66+
67+
imx219_cam3: imx219-cam3@10 {
68+
status = "disabled";
69+
compatible = "sony,imx219";
70+
reg = <0x10>;
71+
clocks = <&ext_cam_ov5647_clk>;
72+
clock-names = "ext_cam_ov5647_clk";
73+
pwdn-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
74+
rockchip,camera-module-index = <0>;
75+
rockchip,camera-module-facing = "back";
76+
rockchip,camera-module-name = "rpi-camera-v2";
77+
rockchip,camera-module-lens-name = "default";
78+
port {
79+
imx219_out_cam3: endpoint {
80+
remote-endpoint = <&mipi_in_dcphy0_cam3>;
81+
data-lanes = <1 2>;
82+
};
83+
};
84+
};
6085
};
6186

6287
&mipi1_csi2 {

0 commit comments

Comments
 (0)