Skip to content

Commit c6cd0b6

Browse files
lukaszsobalalukaszsobala
authored
Merge branch 'rk-6.1-rkr5.1' into rk-6.1-rkr5.1
2 parents bdc4ba3 + 2590770 commit c6cd0b6

31 files changed

+3740
-46
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h2 align="center">
2-
<img src="https://raw.githubusercontent.com/armbian/.github/master/profile/logo.png" alt="Armbian logo" width="25%">
2+
<a href=#><img src="https://raw.githubusercontent.com/armbian/.github/master/profile/logosmall.png" alt="Armbian logo"></a>
33
<br><br>
44
</h2>
55

‎arch/arm/boot/dts/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,6 +1223,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
12231223
rk3308hs-voice-module-board-v10-aarch32.dtb \
12241224
rk3502g-evb1-v10.dtb \
12251225
rk3503g-evb1-v10.dtb \
1226+
rk3506-armsom-forge1.dtb \
12261227
rk3506b-evb1-v10.dtb \
12271228
rk3506b-test2-v10.dtb \
12281229
rk3506g-demo-display-control.dtb \

‎arch/arm/boot/dts/rk3506-armsom-forge1-display-8hd.dtsi‎

Lines changed: 348 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,348 @@
1+
2+
/ {
3+
backlight: backlight {
4+
status = "okay";
5+
compatible = "pwm-backlight";
6+
pwms = <&pwm0_4ch_2 0 25000 0>;
7+
brightness-levels = <
8+
0 20 20 21 21 22 22 23
9+
23 24 24 25 25 26 26 27
10+
27 28 28 29 29 30 30 31
11+
31 32 32 33 33 34 34 35
12+
35 36 36 37 37 38 38 39
13+
40 41 42 43 44 45 46 47
14+
48 49 50 51 52 53 54 55
15+
56 57 58 59 60 61 62 63
16+
64 65 66 67 68 69 70 71
17+
72 73 74 75 76 77 78 79
18+
80 81 82 83 84 85 86 87
19+
88 89 90 91 92 93 94 95
20+
96 97 98 99 100 101 102 103
21+
104 105 106 107 108 109 110 111
22+
112 113 114 115 116 117 118 119
23+
120 121 122 123 124 125 126 127
24+
128 129 130 131 132 133 134 135
25+
136 137 138 139 140 141 142 143
26+
144 145 146 147 148 149 150 151
27+
152 153 154 155 156 157 158 159
28+
160 161 162 163 164 165 166 167
29+
168 169 170 171 172 173 174 175
30+
176 177 178 179 180 181 182 183
31+
184 185 186 187 188 189 190 191
32+
192 193 194 195 196 197 198 199
33+
200 201 202 203 204 205 206 207
34+
208 209 210 211 212 213 214 215
35+
216 217 218 219 220 221 222 223
36+
224 225 226 227 228 229 230 231
37+
232 233 234 235 236 237 238 239
38+
240 241 242 243 244 245 246 247
39+
248 249 250 251 252 253 254 255
40+
>;
41+
default-brightness-level = <200>;
42+
};
43+
};
44+
45+
&display_subsystem {
46+
logo-memory-region = <&drm_logo>;
47+
status = "okay";
48+
};
49+
50+
&dsi {
51+
status = "okay";
52+
53+
#address-cells = <1>;
54+
#size-cells = <0>;
55+
56+
dsi_panel: panel@0 {
57+
status = "okay";
58+
compatible = "simple-panel-dsi";
59+
reg = <0>;
60+
backlight = <&backlight>;
61+
62+
power-supply = <&vcc3v3_lcd_n>;
63+
width-mm = <107>;
64+
height-mm = <199>;
65+
dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
66+
MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_NO_EOT_PACKET)>;
67+
dsi,format = <MIPI_DSI_FMT_RGB888>;
68+
dsi,lanes = <2>;
69+
panel-init-sequence = [
70+
15 00 02 E0 00
71+
15 00 02 E1 93
72+
15 00 02 E2 65
73+
15 00 02 E3 F8
74+
15 00 02 80 03
75+
15 00 02 E0 01
76+
15 00 02 00 00
77+
15 00 02 01 72
78+
15 00 02 03 00
79+
15 00 02 04 65
80+
15 00 02 0C 74
81+
15 00 02 17 00
82+
15 00 02 18 B7
83+
15 00 02 19 00
84+
15 00 02 1A 00
85+
15 00 02 1B B7
86+
15 00 02 1C 00
87+
15 00 02 24 FE
88+
15 00 02 37 19
89+
15 00 02 38 05
90+
15 00 02 39 00
91+
15 00 02 3A 01
92+
15 00 02 3B 01
93+
15 00 02 3C 70
94+
15 00 02 3D FF
95+
15 00 02 3E FF
96+
15 00 02 3F FF
97+
15 00 02 40 06
98+
15 00 02 41 A0
99+
15 00 02 43 1E
100+
15 00 02 44 0F
101+
15 00 02 45 28
102+
15 00 02 4B 04
103+
15 00 02 55 02
104+
15 00 02 56 01
105+
15 00 02 57 A9
106+
15 00 02 58 0A
107+
15 00 02 59 0A
108+
15 00 02 5A 37
109+
15 00 02 5B 19
110+
15 00 02 5D 78
111+
15 00 02 5E 63
112+
15 00 02 5F 54
113+
15 00 02 60 48
114+
15 00 02 61 45
115+
15 00 02 62 38
116+
15 00 02 63 3D
117+
15 00 02 64 28
118+
15 00 02 65 43
119+
15 00 02 66 41
120+
15 00 02 67 43
121+
15 00 02 68 62
122+
15 00 02 69 50
123+
15 00 02 6A 57
124+
15 00 02 6B 49
125+
15 00 02 6C 44
126+
15 00 02 6D 37
127+
15 00 02 6E 23
128+
15 00 02 6F 10
129+
15 00 02 70 78
130+
15 00 02 71 63
131+
15 00 02 72 54
132+
15 00 02 73 49
133+
15 00 02 74 45
134+
15 00 02 75 38
135+
15 00 02 76 3D
136+
15 00 02 77 28
137+
15 00 02 78 43
138+
15 00 02 79 41
139+
15 00 02 7A 43
140+
15 00 02 7B 62
141+
15 00 02 7C 50
142+
15 00 02 7D 57
143+
15 00 02 7E 49
144+
15 00 02 7F 44
145+
15 00 02 80 37
146+
15 00 02 81 23
147+
15 00 02 82 10
148+
15 00 02 E0 02
149+
15 00 02 00 47
150+
15 00 02 01 47
151+
15 00 02 02 45
152+
15 00 02 03 45
153+
15 00 02 04 4B
154+
15 00 02 05 4B
155+
15 00 02 06 49
156+
15 00 02 07 49
157+
15 00 02 08 41
158+
15 00 02 09 1F
159+
15 00 02 0A 1F
160+
15 00 02 0B 1F
161+
15 00 02 0C 1F
162+
15 00 02 0D 1F
163+
15 00 02 0E 1F
164+
15 00 02 0F 5F
165+
15 00 02 10 5F
166+
15 00 02 11 57
167+
15 00 02 12 77
168+
15 00 02 13 35
169+
15 00 02 14 1F
170+
15 00 02 15 1F
171+
15 00 02 16 46
172+
15 00 02 17 46
173+
15 00 02 18 44
174+
15 00 02 19 44
175+
15 00 02 1A 4A
176+
15 00 02 1B 4A
177+
15 00 02 1C 48
178+
15 00 02 1D 48
179+
15 00 02 1E 40
180+
15 00 02 1F 1F
181+
15 00 02 20 1F
182+
15 00 02 21 1F
183+
15 00 02 22 1F
184+
15 00 02 23 1F
185+
15 00 02 24 1F
186+
15 00 02 25 5F
187+
15 00 02 26 5F
188+
15 00 02 27 57
189+
15 00 02 28 77
190+
15 00 02 29 35
191+
15 00 02 2A 1F
192+
15 00 02 2B 1F
193+
15 00 02 58 40
194+
15 00 02 59 00
195+
15 00 02 5A 00
196+
15 00 02 5B 10
197+
15 00 02 5C 06
198+
15 00 02 5D 40
199+
15 00 02 5E 01
200+
15 00 02 5F 02
201+
15 00 02 60 30
202+
15 00 02 61 01
203+
15 00 02 62 02
204+
15 00 02 63 03
205+
15 00 02 64 6B
206+
15 00 02 65 05
207+
15 00 02 66 0C
208+
15 00 02 67 73
209+
15 00 02 68 09
210+
15 00 02 69 03
211+
15 00 02 6A 56
212+
15 00 02 6B 08
213+
15 00 02 6C 00
214+
15 00 02 6D 04
215+
15 00 02 6E 04
216+
15 00 02 6F 88
217+
15 00 02 70 00
218+
15 00 02 71 00
219+
15 00 02 72 06
220+
15 00 02 73 7B
221+
15 00 02 74 00
222+
15 00 02 75 F8
223+
15 00 02 76 00
224+
15 00 02 77 D5
225+
15 00 02 78 2E
226+
15 00 02 79 12
227+
15 00 02 7A 03
228+
15 00 02 7B 00
229+
15 00 02 7C 00
230+
15 00 02 7D 03
231+
15 00 02 7E 7B
232+
15 00 02 E0 04
233+
15 00 02 00 0E
234+
15 00 02 02 B3
235+
15 00 02 09 60
236+
15 00 02 0E 2A
237+
15 00 02 36 59
238+
15 00 02 E0 00
239+
15 00 02 80 01
240+
15 00 02 E0 00
241+
15 00 02 11 00
242+
15 78 02 29 00
243+
];
244+
245+
panel-exit-sequence = [
246+
05 00 01 28
247+
05 00 01 10
248+
];
249+
250+
disp_timings0: display-timings {
251+
native-mode = <&dsi0_timing0>;
252+
dsi0_timing0: timing0 {
253+
clock-frequency = <70000000>;
254+
hactive = <800>;
255+
vactive = <1280>;
256+
hsync-len = <20>;
257+
hback-porch = <20>;
258+
hfront-porch = <40>;
259+
vsync-len = <4>;
260+
vback-porch = <28>;
261+
vfront-porch = <30>;
262+
hsync-active = <0>;
263+
vsync-active = <0>;
264+
de-active = <0>;
265+
pixelclk-active = <0>;
266+
};
267+
};
268+
269+
ports {
270+
#address-cells = <1>;
271+
#size-cells = <0>;
272+
273+
port@0 {
274+
reg = <0>;
275+
panel_in_dsi: endpoint {
276+
remote-endpoint = <&dsi_out_panel>;
277+
};
278+
};
279+
};
280+
};
281+
282+
ports {
283+
#address-cells = <1>;
284+
#size-cells = <0>;
285+
286+
port@1 {
287+
reg = <1>;
288+
dsi_out_panel: endpoint {
289+
remote-endpoint = <&panel_in_dsi>;
290+
};
291+
};
292+
};
293+
};
294+
295+
// &route_dsi {
296+
// status = "okay";
297+
// };
298+
299+
&dsi_dphy {
300+
status = "okay";
301+
};
302+
303+
&dsi_in_vop {
304+
status = "okay";
305+
};
306+
307+
&i2c2 {
308+
pinctrl-names = "default";
309+
pinctrl-0 = <&rm_io4_i2c2_scl &rm_io5_i2c2_sda>;
310+
status = "okay";
311+
#address-cells = <1>;
312+
#size-cells = <0>;
313+
314+
gt9xx: gt9xx@14 {
315+
status = "okay";
316+
compatible = "goodix,gt9xx";
317+
reg = <0x14>;
318+
pinctrl-names = "default";
319+
pinctrl-0 = <&gt9xx_gpio>;
320+
touch-gpio = <&gpio1 RK_PC5 IRQ_TYPE_LEVEL_HIGH>;
321+
reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
322+
max-x = <800>;
323+
max-y = <1280>;
324+
tp-size = <9112>;
325+
tp-supply = <&vcc3v3_lcd_n>;
326+
};
327+
};
328+
329+
&pinctrl {
330+
gt9xx {
331+
gt9xx_gpio: gt9xx-gpio {
332+
rockchip,pins =
333+
<1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,
334+
<1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_up>;
335+
};
336+
};
337+
};
338+
339+
340+
&vop {
341+
status = "okay";
342+
};
343+
344+
&pwm0_4ch_2 {
345+
pinctrl-names = "active";
346+
pinctrl-0 = <&rm_io29_pwm0_ch2>;
347+
status = "okay";
348+
};

0 commit comments

Comments
 (0)