enable lvds 1280x800

hc

2023-11-20 0d8657dd3056063fb115946b10157477b5c70451

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -16,14 +16,6 @@
16
16
 	model = "Rockchip RK3568 EVB1 DDR4 V10 Board";
17
17
 	compatible = "rockchip,rk3568-evb1-ddr4-v10", "rockchip,rk3568";
18
18
 
19
-	rk_headset: rk-headset {
20
-		compatible = "rockchip_headset";
21
-		headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
-		spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
23
-		pinctrl-names = "default";
24
-		pinctrl-0 = <&hp_det>;
25
-	};
26
-
27
19
 	vcc2v5_sys: vcc2v5-ddr {
28
20
 		compatible = "regulator-fixed";
29
21
 		regulator-name = "vcc2v5-sys";
..
..
@@ -34,6 +26,15 @@
34
26
 		vin-supply = <&vcc3v3_sys>;
35
27
 	};
36
28
 
29
+	vcc3v3_vga: vcc3v3-vga {
30
+		compatible = "regulator-fixed";
31
+		regulator-name = "vcc3v3_vga";
32
+		regulator-always-on;
33
+		regulator-boot-on;
34
+		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
35
+		enable-active-high;
36
+		vin-supply = <&vcc3v3_sys>;
37
+	};
37
38
 
38
39
 	pcie30_avdd0v9: pcie30-avdd0v9 {
39
40
 		compatible = "regulator-fixed";
..
..
@@ -60,9 +61,7 @@
60
61
 		regulator-name = "vcc3v3_pcie";
61
62
 		regulator-min-microvolt = <3300000>;
62
63
 		regulator-max-microvolt = <3300000>;
63
-		regulator-always-on;
64
64
 		enable-active-high;
65
-		regulator-boot-on;
66
65
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
67
66
 		startup-delay-us = <5000>;
68
67
 		vin-supply = <&dc_12v>;
..
..
@@ -87,49 +86,123 @@
87
86
 		enable-active-high;
88
87
 		regulator-always-on;
89
88
 		regulator-boot-on;
90
-    	};
89
+	};
91
90
 #endif
92
91
 
93
-	    nk_io_init {
94
-                compatible = "nk_io_control";
95
-				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
96
-                hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
97
-                hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
98
-                vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
99
-                vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
100
-                en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
101
-                reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
102
-                air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
103
-                wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
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			
106
-				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
107
-//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
108
-				pinctrl-names = "default";
109
-				pinctrl-0 = <&nk_io_gpio>;				
110
-        };
111
-		
112
-		panel: panel {
92
+	ndj_io_init {
93
+         	compatible = "nk_io_control";	
94
+			pinctrl-names = "default";
95
+        	pinctrl-0 = <&nk_io_gpio>;
96
+			
97
+			//gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
98
+			
99
+			vcc_5v {
100
+				gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
101
+				gpio_function = <0>;	
102
+			};
103
+			
104
+			vcc_12v {
105
+				gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;  //VCC12_IO_EN_GPIO0_C7_3V3
106
+				gpio_function = <0>;
107
+			};
108
+			
109
+			hub_host2_rst {
110
+				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
111
+				gpio_function = <3>;
112
+			};
113
+			
114
+			hub_host3 {
115
+				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
116
+				gpio_function = <0>;
117
+			};
118
+			
119
+			wake_4g {
120
+				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
121
+				gpio_function = <0>;
122
+			};
123
+			
124
+			air_mode_4g {
125
+				gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
126
+				gpio_function = <0>;
127
+			};
128
+			
129
+			reset_4g {
130
+				gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
131
+				gpio_function = <3>;
132
+			};
133
+			
134
+			en_4g {
135
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
136
+				gpio_function = <0>;
137
+			};
138
+			
139
+			hp_en {
140
+				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
141
+				gpio_function = <0>;
142
+			};
143
+			
144
+			wifi_power_en {
145
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
146
+				gpio_function = <0>;
147
+			};
148
+	#if 0		
149
+			do1 {
150
+				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
151
+				gpio_function = <0>;
152
+			};
153
+			
154
+			do2 {
155
+				gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
156
+				gpio_function = <0>;
157
+			};
158
+			
159
+			do3 {
160
+				gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
161
+				gpio_function = <0>;
162
+			};
163
+			
164
+			do4 {
165
+				gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
166
+				gpio_function = <0>;
167
+			};
168
+			
169
+			do5 {
170
+				gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; 
171
+				gpio_function = <0>;
172
+			};
173
+			
174
+			do6 {
175
+				gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; 
176
+				gpio_function = <0>;
177
+			};
178
+			
179
+			do7 {
180
+				gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; 
181
+				gpio_function = <0>;
182
+			};
183
+			
184
+			di1 {
185
+				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
186
+				gpio_function = <1>;
187
+			};
188
+	#endif
189
+	};
190
+	
191
+			panel: panel {
113
192
 				compatible = "simple-panel";
114
193
 				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
194
+				power-supply = <&vcc3v3_lcd1_n>;
195
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4				
196
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_PWBLK_H_GPIO0_B7
119
197
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
120
198
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
121
199
 				bpc = <8>;
122
200
 				prepare-delay-ms = <200>;
123
201
 				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
202
 
130
203
 				display-timings {
131
-                native-mode = <&timing0>;
132
-                timing0: timing0 {
204
+                native-mode = <&timing>;
205
+                timing: timing {
133
206
 					clock-frequency = <72500000>;
134
207
 					hactive = <1280>;
135
208
 					vactive = <800>;
..
..
@@ -146,8 +219,8 @@
146
219
 					};
147
220
 				};
148
221
 				ports {
149
-					panel_in: endpoint {
150
-					remote-endpoint = <&edp_out>;
222
+					panel_in_lvds: endpoint {
223
+					remote-endpoint = <&lvds_out>;
151
224
 						};
152
225
 					};   
153
226
 				};
..
..
@@ -213,10 +286,6 @@
213
286
  * video_phy0 needs to be enabled
214
287
  * when dsi0 is enabled
215
288
  */
216
-&video_phy0 {
217
-	status = "disabled";
218
-};
219
-
220
289
 &dsi0 {
221
290
 	status = "disabled";
222
291
 };
..
..
@@ -237,10 +306,6 @@
237
306
  * video_phy1 needs to be enabled
238
307
  * when dsi1 is enabled
239
308
  */
240
- 
241
-&video_phy1 {
242
-	status = "okay";
243
-}; 
244
309
 &dsi1 {
245
310
 	status = "disabled";
246
311
 };
..
..
@@ -250,108 +315,58 @@
250
315
 };
251
316
 
252
317
 &dsi1_in_vp1 {
253
-	status = "okay";
318
+	status = "disabled";
254
319
 };
255
320
 
256
321
 &dsi1_panel {
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>;
322
+	power-supply = <&vcc3v3_lcd1_n>;
263
323
 };
264
-
265
-&route_dsi1 {
266
-	status = "disabled";
267
-	connect = <&vp1_out_dsi1>;
268
-};
269
-
270
-
271
-/*
272
-*  edp_start
273
-*/
274
324
 
275
325
 &edp {
326
+	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
276
327
     force-hpd;
328
+    status = "disabled";
329
+};
330
+
331
+&lvds {
277
332
     status = "okay";
278
333
     ports {
279
334
         port@1 {
280
335
             reg = <1>;
281
-            edp_out: endpoint {
282
-                remote-endpoint = <&panel_in>;
336
+            lvds_out: endpoint {
337
+                remote-endpoint = <&panel_in_lvds>;
283
338
             };
284
339
         };
285
-    };
340
+   
341
+	};
342
+};
343
+
344
+&route_lvds{
345
+	 status = "okay";
346
+	 connect = <&vp2_out_lvds>;
347
+};
348
+
349
+&lvds_in_vp2 {
350
+	status = "okay";
286
351
 };
287
352
 
288
353
 &edp_phy {
289
-  status = "okay";
290
-
354
+	status = "okay";
291
355
 };
292
356
 
293
357
 &edp_in_vp0 {
294
-    status = "disabled";
295
-};
296
-
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 {
339
358
 	status = "disabled";
340
359
 };
341
360
 
342
-&hdmi_sound {
361
+&edp_in_vp1 {
343
362
 	status = "okay";
344
363
 };
345
-
346
-/*
347
- *  Hdmi_END
348
-*/
349
364
 
350
365
 &gmac0 {
351
366
 	phy-mode = "rgmii";
352
367
 	clock_in_out = "output";
353
368
 
354
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
369
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
355
370
 	snps,reset-active-low;
356
371
 	/* Reset time is 20ms, 100ms for rtl8211f */
357
372
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -371,7 +386,7 @@
371
386
 	rx_delay = <0x2f>;
372
387
 
373
388
 	phy-handle = <&rgmii_phy0>;
374
-	status = "disabled";
389
+	status = "okay";
375
390
 };
376
391
 
377
392
 &gmac1 {
..
..
@@ -405,9 +420,7 @@
405
420
  * power-supply should switche to vcc3v3_lcd1_n
406
421
  * when mipi panel is connected to dsi1.
407
422
  */
408
-&gt1x {
409
-	power-supply = <&vcc3v3_lcd0_n>;
410
-};
423
+
411
424
 
412
425
 &i2c3 {
413
426
 	status = "okay";
..
..
@@ -426,7 +439,7 @@
426
439
 };
427
440
 
428
441
 &i2c4 {
429
-	status = "okay";
442
+	status = "disabled";
430
443
 	gc8034: gc8034@37 {
431
444
 		compatible = "galaxycore,gc8034";
432
445
 		status = "okay";
..
..
@@ -472,7 +485,7 @@
472
485
 		};
473
486
 	};
474
487
 	ov5695: ov5695@36 {
475
-		status = "okay";
488
+		status = "disabled";
476
489
 		compatible = "ovti,ov5695";
477
490
 		reg = <0x36>;
478
491
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -495,19 +508,6 @@
495
508
 	};
496
509
 };
497
510
 
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
-
511
511
 &mdio0 {
512
512
 	rgmii_phy0: phy@0 {
513
513
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -522,10 +522,16 @@
522
522
 	};
523
523
 };
524
524
 
525
+&video_phy0 {
526
+	status = "okay";
527
+};
525
528
 
529
+&video_phy1 {
530
+	status = "disabled";
531
+};
526
532
 
527
533
 &pcie30phy {
528
-	status = "okay";
534
+	status = "disabled";
529
535
 };
530
536
 
531
537
 &pcie2x1 {
..
..
@@ -534,39 +540,26 @@
534
540
 	status = "okay";
535
541
 };
536
542
 
543
+&pcie3x2 {
544
+	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
545
+	vpcie3v3-supply = <&vcc3v3_pcie>;
546
+	status = "okay";
547
+};
548
+
537
549
 &pinctrl {
538
-//	cam {
539
-//		camera_pwr: camera-pwr {
540
-//			rockchip,pins =
541
-//				/* camera power en */
542
-//				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
543
-//		};
544
-//	};
550
+
545
551
 	headphone {
546
552
 		hp_det: hp-det {
547
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
548
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
553
+			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
549
554
 		};
550
555
 	};
551
556
 
552
557
 	wireless-wlan {
553
558
 		wifi_host_wake_irq: wifi-host-wake-irq {
554
-			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
555
-		};
556
-	};
557
-
558
-	wireless-bluetooth {
559
-		uart1_gpios: uart1-gpios {
560
-			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
559
+			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
561
560
 		};
562
561
 	};
563
562
 	
564
-	lcd1 {
565
-        lcd1_rst_gpio: lcd1-rst-gpio {
566
-            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
567
-        };
568
-    };
569
-		
570
563
 	nk_io_init{
571
564
 		nk_io_gpio: nk-io-gpio{
572
565
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -576,7 +569,7 @@
576
569
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
577
570
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
578
571
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
579
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
572
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
580
573
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
581
574
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
582
575
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -585,9 +578,17 @@
585
578
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
586
579
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
587
580
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
581
+							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
582
+							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
583
+							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
584
+							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
588
585
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
589
586
 		};
590
587
 	};
588
+};
589
+
590
+&rk809_sound {
591
+	hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
591
592
 };
592
593
 
593
594
 &rkisp {
..
..
@@ -612,32 +613,36 @@
612
613
 	};
613
614
 };
614
615
 
616
+&route_dsi0 {
617
+	status = "disabled";
618
+	connect = <&vp1_out_dsi0>;
619
+};
615
620
 
616
621
 
617
622
 
623
+&route_edp {
624
+	status = "disabled";
625
+	connect = <&vp1_out_edp>;
626
+};
618
627
 
619
628
 &sata2 {
620
629
 	status = "okay";
621
630
 };
622
631
 
623
632
 &sdmmc2 {
624
-        status = "disabled";
625
-};
626
-
627
-&sdmmc1 {
628
-        max-frequency = <150000000>;
629
-        supports-sdio;
630
-        bus-width = <4>;
631
-        disable-wp;
632
-        cap-sd-highspeed;
633
-        cap-sdio-irq;
634
-        keep-power-in-suspend;
635
-        mmc-pwrseq = <&sdio_pwrseq>;
636
-        non-removable;
637
-        pinctrl-names = "default";
638
-        pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
639
-        sd-uhs-sdr104;
640
-        status = "okay";
633
+	max-frequency = <150000000>;
634
+	supports-sdio;
635
+	bus-width = <4>;
636
+	disable-wp;
637
+	cap-sd-highspeed;
638
+	cap-sdio-irq;
639
+	keep-power-in-suspend;
640
+	mmc-pwrseq = <&sdio_pwrseq>;
641
+	non-removable;
642
+	pinctrl-names = "default";
643
+	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
644
+	sd-uhs-sdr104;
645
+	status = "okay";
641
646
 };
642
647
 
643
648
 &spdif_8ch {
..
..
@@ -670,22 +675,17 @@
670
675
 
671
676
 &wireless_bluetooth {
672
677
 	compatible = "bluetooth-platdata";
673
-	clocks = <&rk809 1>;
674
-	clock-names = "ext_clock";
675
-	//wifi-bt-power-toggle;
676
-	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
677
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
678
-	pinctrl-names = "default", "rts_gpio";
679
-	pinctrl-0 = <&uart1m0_rtsn>;
680
-	pinctrl-1 = <&uart1_gpios>;
681
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
682
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
683
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
684
678
 	status = "disabled";
685
679
 };
686
680
 
687
681
 &uart0 {
688
682
 	status = "okay";
683
+};
684
+
685
+&uart1 {	
686
+	pinctrl-names = "default";	
687
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
688
+	status = "disabled";		
689
689
 };
690
690
 
691
691
 &uart3 {
..
..
@@ -711,4 +711,4 @@
711
711
 &uart9 {
712
712
 	status = "okay";
713
713
 	pinctrl-0 = <&uart9m1_xfer>;
714
-};
714
+};