add .BoardConfig.mk package-file

hc

2023-05-31 43fd8d44e8182b691c8ee61d487cec02ca11afd2

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -8,6 +8,7 @@
8
8
 
9
9
 #include <dt-bindings/gpio/gpio.h>
10
10
 #include <dt-bindings/pinctrl/rockchip.h>
11
+#include <dt-bindings/display/media-bus-format.h>
11
12
 #include "rk3568.dtsi"
12
13
 #include "rk3568-evb.dtsi"
13
14
 
..
..
@@ -17,7 +18,8 @@
17
18
 
18
19
 	rk_headset: rk-headset {
19
20
 		compatible = "rockchip_headset";
20
-		headset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
21
+		headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
+		spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
21
23
 		pinctrl-names = "default";
22
24
 		pinctrl-0 = <&hp_det>;
23
25
 	};
..
..
@@ -32,15 +34,6 @@
32
34
 		vin-supply = <&vcc3v3_sys>;
33
35
 	};
34
36
 
35
-	vcc3v3_vga: vcc3v3-vga {
36
-		compatible = "regulator-fixed";
37
-		regulator-name = "vcc3v3_vga";
38
-		regulator-always-on;
39
-		regulator-boot-on;
40
-		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
41
-		enable-active-high;
42
-		vin-supply = <&vcc3v3_sys>;
43
-	};
44
37
 
45
38
 	pcie30_avdd0v9: pcie30-avdd0v9 {
46
39
 		compatible = "regulator-fixed";
..
..
@@ -67,7 +60,9 @@
67
60
 		regulator-name = "vcc3v3_pcie";
68
61
 		regulator-min-microvolt = <3300000>;
69
62
 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
70
64
 		enable-active-high;
65
+		regulator-boot-on;
71
66
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
72
67
 		startup-delay-us = <5000>;
73
68
 		vin-supply = <&dc_12v>;
..
..
@@ -97,35 +92,65 @@
97
92
 
98
93
 	    nk_io_init {
99
94
                 compatible = "nk_io_control";
100
-				usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;  //USB_EN_OC_GPIO0_A5
101
-				lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
102
-				lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
103
95
 				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
104
96
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
105
97
                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
106
-//              hub_host3_5V_rest_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; 
107
98
                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
108
99
                 vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
109
100
                 en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
110
101
                 reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
111
102
                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
112
103
                 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
113
-                
114
-				edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
115
-                edp_gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>; //7511_GPIO0-GPIO3_D2
116
-				edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; //7511_GPIO1-GPIO3_D3
117
-				edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; //7511_GPIO2-GPIO3_D4
118
-				edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; //7511_GPIO3-GPIO3_D5
119
-                edp_reset = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
120
-//              tp_reset = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
121
-//              vddio_mipi = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
122
-		
104
+				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
105
+//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
123
106
 				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
124
-
107
+//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
125
108
 				pinctrl-names = "default";
126
-				pinctrl-0 = <&nk_io_gpio>;
127
-				nodka_lvds = <9>;
109
+				pinctrl-0 = <&nk_io_gpio>;				
128
110
         };
111
+		
112
+		panel: panel {
113
+				compatible = "simple-panel";
114
+				backlight = <&backlight>;
115
+				power-supply = <&vcc3v3_lcd0_n>;
116
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
117
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
118
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
119
+				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
120
+				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
121
+				bpc = <8>;
122
+				prepare-delay-ms = <200>;
123
+				enable-delay-ms = <20>;
124
+				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
125
+				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
126
+				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
127
+				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
128
+				nodka-lvds = <15>;
129
+
130
+				display-timings {
131
+                native-mode = <&timing0>;
132
+                timing0: timing0 {
133
+					clock-frequency = <72500000>;
134
+					hactive = <1280>;
135
+					vactive = <800>;
136
+					hfront-porch = <70>;
137
+					hsync-len = <2>;
138
+					hback-porch = <88>;
139
+					vfront-porch = <7>;
140
+					vsync-len = <4>;
141
+					vback-porch = <17>;
142
+					hsync-active = <21>;
143
+					vsync-active = <0>;
144
+					de-active = <0>;
145
+					pixelclk-active = <0>;			
146
+					};
147
+				};
148
+				ports {
149
+					panel_in: endpoint {
150
+					remote-endpoint = <&edp_out>;
151
+						};
152
+					};   
153
+				};
129
154
 };
130
155
 
131
156
 &combphy0_us {
..
..
@@ -141,11 +166,11 @@
141
166
 };
142
167
 
143
168
 &csi2_dphy_hw {
144
-	status = "okay";
169
+	status = "disabled";
145
170
 };
146
171
 
147
172
 &csi2_dphy0 {
148
-	status = "okay";
173
+	status = "disabled";
149
174
 
150
175
 	ports {
151
176
 		#address-cells = <1>;
..
..
@@ -188,8 +213,12 @@
188
213
  * video_phy0 needs to be enabled
189
214
  * when dsi0 is enabled
190
215
  */
216
+&video_phy0 {
217
+	status = "disabled";
218
+};
219
+
191
220
 &dsi0 {
192
-	status = "okay";
221
+	status = "disabled";
193
222
 };
194
223
 
195
224
 &dsi0_in_vp0 {
..
..
@@ -197,7 +226,7 @@
197
226
 };
198
227
 
199
228
 &dsi0_in_vp1 {
200
-	status = "okay";
229
+	status = "disabled";
201
230
 };
202
231
 
203
232
 &dsi0_panel {
..
..
@@ -208,6 +237,10 @@
208
237
  * video_phy1 needs to be enabled
209
238
  * when dsi1 is enabled
210
239
  */
240
+ 
241
+&video_phy1 {
242
+	status = "okay";
243
+}; 
211
244
 &dsi1 {
212
245
 	status = "disabled";
213
246
 };
..
..
@@ -217,29 +250,102 @@
217
250
 };
218
251
 
219
252
 &dsi1_in_vp1 {
220
-	status = "disabled";
253
+	status = "okay";
221
254
 };
222
255
 
223
256
 &dsi1_panel {
224
-	power-supply = <&vcc3v3_lcd1_n>;
257
+	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
258
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
259
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
260
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
261
+    pinctrl-names = "default";
262
+    pinctrl-0 = <&lcd1_rst_gpio>;
225
263
 };
226
264
 
265
+&route_dsi1 {
266
+	status = "disabled";
267
+	connect = <&vp1_out_dsi1>;
268
+};
269
+
270
+
271
+/*
272
+*  edp_start
273
+*/
274
+
227
275
 &edp {
228
-	hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
229
-	status = "okay";
276
+    force-hpd;
277
+    status = "okay";
278
+    ports {
279
+        port@1 {
280
+            reg = <1>;
281
+            edp_out: endpoint {
282
+                remote-endpoint = <&panel_in>;
283
+            };
284
+        };
285
+    };
230
286
 };
231
287
 
232
288
 &edp_phy {
233
-	status = "okay";
289
+  status = "okay";
290
+
234
291
 };
235
292
 
236
293
 &edp_in_vp0 {
237
-	status = "okay";
294
+    status = "disabled";
238
295
 };
239
296
 
240
297
 &edp_in_vp1 {
298
+    status = "okay";
299
+
300
+};
301
+
302
+&route_edp {
303
+    status = "okay";
304
+    connect = <&vp1_out_edp>;
305
+};
306
+
307
+&route_edp {
308
+	status = "okay";
309
+};
310
+/*
311
+*  edp_end
312
+*/
313
+
314
+/*
315
+*  Hdmi_start
316
+*/
317
+
318
+&hdmi {
319
+	status = "okay";
320
+	rockchip,phy-table =
321
+		<92812500  0x8009 0x0000 0x0270>,
322
+		<165000000 0x800b 0x0000 0x026d>,
323
+		<185625000 0x800b 0x0000 0x01ed>,
324
+		<297000000 0x800b 0x0000 0x01ad>,
325
+		<594000000 0x8029 0x0000 0x0088>,
326
+		<000000000 0x0000 0x0000 0x0000>;
327
+};
328
+
329
+&route_hdmi {
330
+	status = "okay";
331
+	connect = <&vp0_out_hdmi>;
332
+};
333
+
334
+&hdmi_in_vp0 {
335
+	status = "okay";
336
+};
337
+
338
+&hdmi_in_vp1 {
241
339
 	status = "disabled";
242
340
 };
341
+
342
+&hdmi_sound {
343
+	status = "okay";
344
+};
345
+
346
+/*
347
+ *  Hdmi_END
348
+*/
243
349
 
244
350
 &gmac0 {
245
351
 	phy-mode = "rgmii";
..
..
@@ -317,9 +423,6 @@
317
423
                 compatible = "nk_mcu";
318
424
                 reg = <0x15>;
319
425
         };
320
-
321
-
322
-
323
426
 };
324
427
 
325
428
 &i2c4 {
..
..
@@ -392,6 +495,19 @@
392
495
 	};
393
496
 };
394
497
 
498
+&i2c5 {
499
+	status = "okay";
500
+
501
+	hym8563: hym8563@51 {
502
+		compatible = "haoyu,hym8563";
503
+		reg = <0x51>;
504
+		#clock-cells = <0>;
505
+		clock-frequency = <32768>;
506
+		clock-output-names = "xin32k";
507
+		/* rtc_int is not connected */
508
+	};
509
+};
510
+
395
511
 &mdio0 {
396
512
 	rgmii_phy0: phy@0 {
397
513
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -406,20 +522,14 @@
406
522
 	};
407
523
 };
408
524
 
409
-&video_phy0 {
410
-	status = "okay";
411
-};
412
525
 
413
-&video_phy1 {
414
-	status = "disabled";
415
-};
416
526
 
417
527
 &pcie30phy {
418
528
 	status = "okay";
419
529
 };
420
530
 
421
-&pcie3x2 {
422
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
531
+&pcie2x1 {
532
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
423
533
 	vpcie3v3-supply = <&vcc3v3_pcie>;
424
534
 	status = "okay";
425
535
 };
..
..
@@ -434,7 +544,8 @@
434
544
 //	};
435
545
 	headphone {
436
546
 		hp_det: hp-det {
437
-			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
547
+			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
548
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
438
549
 		};
439
550
 	};
440
551
 
..
..
@@ -449,23 +560,46 @@
449
560
 			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
450
561
 		};
451
562
 	};
563
+	
564
+	lcd1 {
565
+        lcd1_rst_gpio: lcd1-rst-gpio {
566
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
567
+        };
568
+    };
569
+		
452
570
 	nk_io_init{
453
571
 		nk_io_gpio: nk-io-gpio{
454
-            rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
572
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
573
+							<0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
574
+							<0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
575
+							<4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
576
+							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
577
+							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
578
+							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
579
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
580
+							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
581
+							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
582
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
583
+							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
584
+							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
585
+							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
586
+							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
587
+							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
588
+							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
455
589
 		};
456
590
 	};
457
591
 };
458
592
 
459
593
 &rkisp {
460
-	status = "okay";
594
+	status = "disabled";
461
595
 };
462
596
 
463
597
 &rkisp_mmu {
464
-	status = "okay";
598
+	status = "disabled";
465
599
 };
466
600
 
467
601
 &rkisp_vir0 {
468
-	status = "okay";
602
+	status = "disabled";
469
603
 
470
604
 	port {
471
605
 		#address-cells = <1>;
..
..
@@ -478,15 +612,9 @@
478
612
 	};
479
613
 };
480
614
 
481
-&route_dsi0 {
482
-	status = "okay";
483
-	connect = <&vp1_out_dsi0>;
484
-};
485
615
 
486
-&route_edp {
487
-	status = "okay";
488
-	connect = <&vp0_out_edp>;
489
-};
616
+
617
+
490
618
 
491
619
 &sata2 {
492
620
 	status = "okay";
..
..
@@ -525,12 +653,12 @@
525
653
 };
526
654
 
527
655
 &vcc3v3_lcd0_n {
528
-	gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
656
+	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
529
657
 	enable-active-high;
530
658
 };
531
659
 
532
660
 &vcc3v3_lcd1_n {
533
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
661
+	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
534
662
 	enable-active-high;
535
663
 };
536
664