Skip to content

Commit 773c17d

Browse files
SeeleVolleriSeeleVolleri
authored
Merge branch 'rk-6.1-rkr5.1' into rk-6.1-rkr5.1
2 parents eb6022d + 64a8171 commit 773c17d

50 files changed

Lines changed: 7505 additions & 20 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb6-ddr3-v10-rk630-bt656-to-cvbs.dtb
212212
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb7-ddr4-v10.dtb
213213
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb8-lp4-v10.dtb
214214
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb8-lp4-v10-linux.dtb
215+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-easepi-a2.dtb
215216
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-hinlink-h66k.dtb
216217
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-hinlink-h68k.dtb
217218
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-hinlink-hnas.dtb
@@ -379,6 +380,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-evb7-v11-rk628-hdmi2csi.dtb
379380
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-armsom-aim7-io.dtb
380381
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-armsom-sige7.dtb
381382
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-armsom-w3.dtb
383+
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-easepi-r2.dtb
382384
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-cyber-aib.dtb
383385
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-firefly-itx-3588j.dtb
384386
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-fxblox-rk1.dtb

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,52 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
4848
rock-5a-sata.dtbo \
4949
rock-5b-hdmi1-8k.dtbo \
5050
rock-5b-hdmi2-8k.dtbo \
51+
rock-5b-okdo-5mp-camera.dtbo \
5152
rock-5b-pd-max-voltage-12v.dtbo \
5253
rock-5b-radxa-display-10hd.dtbo \
5354
rock-5b-radxa-display-8hd.dtbo \
5455
rock-5b-radxa-display-10fhd.dtbo \
56+
rock-5b-rpi-camera-v1_3.dtbo \
5557
rock-5b-rpi-camera-v2.dtbo \
58+
rock-5b-radxa-camera-13m-214.dtbo \
5659
rock-5b-radxa-camera-4k.dtbo \
60+
rock-5b-radxa-camera-8m-219.dtbo \
5761
rock-5b-sata.dtbo \
62+
rock-5b-plus-cam0-okdo-5mp-camera.dtbo \
63+
rock-5b-plus-cam0-rpi-camera-v1p3.dtbo \
64+
rock-5b-plus-cam0-rpi-camera-v2.dtbo \
65+
rock-5b-plus-cam0-radxa-camera-13m-214.dtbo \
5866
rock-5b-plus-cam0-radxa-camera-4k.dtbo \
67+
rock-5b-plus-cam0-radxa-camera-8m-219.dtbo \
68+
rock-5b-plus-cam1-okdo-5mp-camera.dtbo \
69+
rock-5b-plus-cam1-radxa-camera-13m-214.dtbo \
70+
rock-5b-plus-cam1-radxa-camera-4k.dtbo \
71+
rock-5b-plus-cam1-radxa-camera-8m-219.dtbo \
72+
rock-5b-plus-cam1-rpi-camera-v1p3.dtbo \
73+
rock-5b-plus-cam1-rpi-camera-v2.dtbo \
5974
rock-5b-plus-radxa-display-8hd.dtbo \
6075
rock-5b-plus-radxa-display-10fhd.dtbo \
76+
rock-5t-cam0-okdo-5mp-camera.dtbo \
77+
rock-5t-cam0-rpi-camera-v1p3.dtbo \
78+
rock-5t-cam0-rpi-camera-v2.dtbo \
79+
rock-5t-cam0-radxa-camera-13m-214.dtbo \
80+
rock-5t-cam0-radxa-camera-4k.dtbo \
81+
rock-5t-cam0-radxa-camera-8m-219.dtbo \
82+
rock-5t-cam1-okdo-5mp-camera.dtbo \
83+
rock-5t-cam1-rpi-camera-v1p3.dtbo \
84+
rock-5t-cam1-rpi-camera-v2.dtbo \
85+
rock-5t-cam1-radxa-camera-13m-214.dtbo \
86+
rock-5t-cam1-radxa-camera-4k.dtbo \
87+
rock-5t-cam1-radxa-camera-8m-219.dtbo \
88+
rock-5t-radxa-display-8hd.dtbo \
6189
rock-5t-radxa-display-10fhd.dtbo \
90+
rock-5t-industrial-cam1-okdo-5mp-camera.dtbo \
91+
rock-5t-industrial-cam1-rpi-camera-v1p3.dtbo \
92+
rock-5t-industrial-cam1-rpi-camera-v2.dtbo \
93+
rock-5t-industrial-cam1-radxa-camera-4k.dtbo \
94+
rock-5t-industrial-cam1-radxa-camera-8m-219.dtbo \
95+
rock-5t-industrial-radxa-display-10fhd.dtbo \
96+
rock-5t-industrial-radxa-display-8hd.dtbo \
6297
rock-5-itx-radxa-camera-4k-on-cam0.dtbo \
6398
rock-5-itx-radxa-camera-4k-on-cam1.dtbo \
6499
rock-5-itx-radxa-display-8hd-on-lcd0.dtbo \

‎arch/arm64/boot/dts/rockchip/overlay/recomputer-rk3576-devkit-dp-4k.dts‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
/dts-v1/;
22
/plugin/;
33

4+
#include <dt-bindings/clock/rockchip,rk3576-cru.h>
5+
46
/ {
57
metadata {
68
title = "Route recomputer rk3576 devkit HDMI to VP1 and DP to VP0";
79
compatible = "seeed,recomputer rk3576 devkit";
810
category = "display";
9-
description = "Switch display routing so HDMI uses VP1 and DP uses VP0.";
11+
description = "Switch display routing so HDMI uses VP1 and DP uses VP0. Sets dclk_vp0_src parent to vpll for 4K@60Hz pixel clock support.";
1012
};
1113

1214
fragment@0 {
@@ -69,4 +71,17 @@
6971
target = <&vp1>;
7072
__overlay__ { status = "okay"; };
7173
};
74+
75+
/* Set dclk_vp0_src parent to vpll so DP on VP0 can achieve 4K@60Hz.
76+
* Without this, DP falls back to gpll/cpll which can only provide
77+
* ~396MHz (via divider), far below the 533.25MHz needed for 4K@60Hz.
78+
* With vpll, the driver reprograms vpll to 1066.5MHz and divides by 2.
79+
*/
80+
fragment@11 {
81+
target = <&vop>;
82+
__overlay__ {
83+
assigned-clocks = <&cru DCLK_VP0_SRC>;
84+
assigned-clock-parents = <&cru PLL_VPLL>;
85+
};
86+
};
7287
};

‎arch/arm64/boot/dts/rockchip/overlay/rock-5b-okdo-5mp-camera.dts‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
/dts-v1/;
2+
/plugin/;
3+
4+
#include <dt-bindings/gpio/gpio.h>
5+
#include <dt-bindings/pinctrl/rockchip.h>
6+
7+
/ {
8+
metadata {
9+
title ="Enable OKDO 5MP Camera";
10+
compatible = "radxa,rock-5b";
11+
category = "camera";
12+
exclusive = "csi2_dphy0";
13+
description = "Enable OKDO 5MP Camera.";
14+
};
15+
};
16+
17+
&{/} {
18+
clk_cam_25m: external-camera-clock-25m {
19+
status = "okay";
20+
compatible = "fixed-clock";
21+
clock-frequency = <25000000>;
22+
clock-output-names = "clk_cam_25m";
23+
#clock-cells = <0>;
24+
};
25+
};
26+
27+
&i2c3 {
28+
status = "okay";
29+
#address-cells = <1>;
30+
#size-cells = <0>;
31+
32+
ov5647: ov5647@36 {
33+
status = "okay";
34+
compatible = "ovti,ov5647";
35+
reg = <0x36>;
36+
clocks = <&clk_cam_25m>;
37+
pwdn-gpios = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;
38+
clock-names = "ext_cam_clk";
39+
rockchip,camera-module-index = <0>;
40+
rockchip,camera-module-facing = "back";
41+
rockchip,camera-module-name = "OKDO-5MP";
42+
rockchip,camera-module-lens-name = "default";
43+
44+
port {
45+
ov5647_out0: endpoint {
46+
remote-endpoint = <&mipidphy0_in_ucam1>;
47+
data-lanes = <1 2>;
48+
};
49+
};
50+
};
51+
};
52+
53+
&csi2_dphy0_hw {
54+
status = "okay";
55+
};
56+
57+
&csi2_dphy0 {
58+
status = "okay";
59+
60+
ports {
61+
#address-cells = <1>;
62+
#size-cells = <0>;
63+
64+
port@0 {
65+
reg = <0>;
66+
#address-cells = <1>;
67+
#size-cells = <0>;
68+
69+
mipidphy0_in_ucam1: endpoint@2 {
70+
reg = <2>;
71+
remote-endpoint = <&ov5647_out0>;
72+
data-lanes = <1 2>;
73+
};
74+
};
75+
76+
port@1 {
77+
reg = <1>;
78+
#address-cells = <1>;
79+
#size-cells = <0>;
80+
81+
csidphy0_out: endpoint@0 {
82+
reg = <0>;
83+
remote-endpoint = <&mipi2_csi2_input>;
84+
};
85+
};
86+
};
87+
};
88+
89+
&mipi2_csi2 {
90+
status = "okay";
91+
92+
ports {
93+
#address-cells = <1>;
94+
#size-cells = <0>;
95+
96+
port@0 {
97+
reg = <0>;
98+
#address-cells = <1>;
99+
#size-cells = <0>;
100+
101+
mipi2_csi2_input: endpoint@1 {
102+
reg = <1>;
103+
remote-endpoint = <&csidphy0_out>;
104+
};
105+
};
106+
107+
port@1 {
108+
reg = <1>;
109+
#address-cells = <1>;
110+
#size-cells = <0>;
111+
112+
mipi2_csi2_output: endpoint@0 {
113+
reg = <0>;
114+
remote-endpoint = <&cif_mipi2_in0>;
115+
};
116+
};
117+
};
118+
};
119+
120+
&rkcif {
121+
status = "okay";
122+
};
123+
124+
&rkcif_mipi_lvds2 {
125+
status = "okay";
126+
127+
port {
128+
cif_mipi2_in0: endpoint {
129+
remote-endpoint = <&mipi2_csi2_output>;
130+
};
131+
};
132+
};
133+
134+
&rkcif_mipi_lvds2_sditf {
135+
status = "okay";
136+
137+
port {
138+
mipi_lvds2_sditf: endpoint {
139+
remote-endpoint = <&isp0_vir0>;
140+
};
141+
};
142+
};
143+
144+
&rkcif_mmu {
145+
status = "okay";
146+
};
147+
148+
&isp0_mmu {
149+
status = "okay";
150+
};
151+
152+
&rkisp0 {
153+
status = "okay";
154+
};
155+
156+
&rkisp0_vir0 {
157+
status = "okay";
158+
159+
port {
160+
#address-cells = <1>;
161+
#size-cells = <0>;
162+
163+
isp0_vir0: endpoint@0 {
164+
reg = <0>;
165+
remote-endpoint = <&mipi_lvds2_sditf>;
166+
};
167+
};
168+
};
169+
170+
&pinctrl {
171+
camera {
172+
cam_pwdn_gpio: cam-pwdn-gpio {
173+
rockchip,pins = <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
174+
};
175+
};
176+
};

0 commit comments

Comments
 (0)