add ip1811 driver

hc

2023-11-22 9ca5fbcb63a8dcaee0527f96afb91dc4b4bd8fa9

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -16,13 +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
-		pinctrl-names = "default";
23
-		pinctrl-0 = <&hp_det>;
24
-	};
25
-
26
19
 	vcc2v5_sys: vcc2v5-ddr {
27
20
 		compatible = "regulator-fixed";
28
21
 		regulator-name = "vcc2v5-sys";
..
..
@@ -33,6 +26,15 @@
33
26
 		vin-supply = <&vcc3v3_sys>;
34
27
 	};
35
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
+	};
36
38
 
37
39
 	pcie30_avdd0v9: pcie30-avdd0v9 {
38
40
 		compatible = "regulator-fixed";
..
..
@@ -59,9 +61,7 @@
59
61
 		regulator-name = "vcc3v3_pcie";
60
62
 		regulator-min-microvolt = <3300000>;
61
63
 		regulator-max-microvolt = <3300000>;
62
-		regulator-always-on;
63
64
 		enable-active-high;
64
-		regulator-boot-on;
65
65
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
66
66
 		startup-delay-us = <5000>;
67
67
 		vin-supply = <&dc_12v>;
..
..
@@ -86,49 +86,130 @@
86
86
 		enable-active-high;
87
87
 		regulator-always-on;
88
88
 		regulator-boot-on;
89
-    	};
89
+	};
90
90
 #endif
91
91
 
92
-	    nk_io_init {
93
-                compatible = "nk_io_control";
94
-				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
95
-                hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
96
-                hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
97
-                vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
98
-                vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
99
-                en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
100
-                reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
101
-                air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
102
-                wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
103
-				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
104
-                spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
105
-				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
106
-//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
107
-				pinctrl-names = "default";
108
-				pinctrl-0 = <&nk_io_gpio>;				
109
-        };
110
-		
111
-		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
+			usb_ogt {
145
+				gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
146
+				gpio_function = <0>;
147
+			};
148
+			
149
+			m2_wifi_pwr {
150
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;//WIFI_PWREN_GPIO3_C6_1V8
151
+				gpio_function = <0>;
152
+			};
153
+			
154
+			 
155
+	#if 0		
156
+			do1 {
157
+				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
158
+				gpio_function = <0>;
159
+			};
160
+			
161
+			do2 {
162
+				gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
163
+				gpio_function = <0>;
164
+			};
165
+			
166
+			do3 {
167
+				gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
168
+				gpio_function = <0>;
169
+			};
170
+			
171
+			do4 {
172
+				gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
173
+				gpio_function = <0>;
174
+			};
175
+			
176
+			do5 {
177
+				gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; 
178
+				gpio_function = <0>;
179
+			};
180
+			
181
+			do6 {
182
+				gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; 
183
+				gpio_function = <0>;
184
+			};
185
+			
186
+			do7 {
187
+				gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; 
188
+				gpio_function = <0>;
189
+			};
190
+			
191
+			di1 {
192
+				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
193
+				gpio_function = <1>;
194
+			};
195
+	#endif
196
+	};
197
+	
198
+			panel: panel {
112
199
 				compatible = "simple-panel";
113
200
 				backlight = <&backlight>;
114
201
 				power-supply = <&vcc3v3_lcd0_n>;
115
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
116
-				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
117
-				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
202
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4				
203
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_PWBLK_H_GPIO0_B7
118
204
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
119
205
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
120
206
 				bpc = <8>;
121
207
 				prepare-delay-ms = <200>;
122
208
 				enable-delay-ms = <20>;
123
-				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
124
-				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
125
-				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
126
-				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
127
-				nodka-lvds = <15>;
128
209
 
129
210
 				display-timings {
130
-                native-mode = <&timing0>;
131
-                timing0: timing0 {
211
+                native-mode = <&timing>;
212
+                timing: timing {
132
213
 					clock-frequency = <72500000>;
133
214
 					hactive = <1280>;
134
215
 					vactive = <800>;
..
..
@@ -145,8 +226,8 @@
145
226
 					};
146
227
 				};
147
228
 				ports {
148
-					panel_in: endpoint {
149
-					remote-endpoint = <&edp_out>;
229
+					panel_in_lvds: endpoint {
230
+					remote-endpoint = <&lvds_out>;
150
231
 						};
151
232
 					};   
152
233
 				};
..
..
@@ -212,10 +293,6 @@
212
293
  * video_phy0 needs to be enabled
213
294
  * when dsi0 is enabled
214
295
  */
215
-&video_phy0 {
216
-	status = "disabled";
217
-};
218
-
219
296
 &dsi0 {
220
297
 	status = "disabled";
221
298
 };
..
..
@@ -236,10 +313,6 @@
236
313
  * video_phy1 needs to be enabled
237
314
  * when dsi1 is enabled
238
315
  */
239
- 
240
-&video_phy1 {
241
-	status = "okay";
242
-}; 
243
316
 &dsi1 {
244
317
 	status = "disabled";
245
318
 };
..
..
@@ -249,108 +322,58 @@
249
322
 };
250
323
 
251
324
 &dsi1_in_vp1 {
252
-	status = "okay";
325
+	status = "disabled";
253
326
 };
254
327
 
255
328
 &dsi1_panel {
256
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
257
-    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
258
-    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
259
-    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
260
-    pinctrl-names = "default";
261
-    pinctrl-0 = <&lcd1_rst_gpio>;
329
+	power-supply = <&vcc3v3_lcd1_n>;
262
330
 };
263
-
264
-&route_dsi1 {
265
-	status = "disabled";
266
-	connect = <&vp1_out_dsi1>;
267
-};
268
-
269
-
270
-/*
271
-*  edp_start
272
-*/
273
331
 
274
332
 &edp {
333
+	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
275
334
     force-hpd;
335
+    status = "disabled";
336
+};
337
+
338
+&lvds {
276
339
     status = "okay";
277
340
     ports {
278
341
         port@1 {
279
342
             reg = <1>;
280
-            edp_out: endpoint {
281
-                remote-endpoint = <&panel_in>;
343
+            lvds_out: endpoint {
344
+                remote-endpoint = <&panel_in_lvds>;
282
345
             };
283
346
         };
284
-    };
347
+   
348
+	};
349
+};
350
+
351
+&route_lvds{
352
+	 status = "okay";
353
+	 connect = <&vp2_out_lvds>;
354
+};
355
+
356
+&lvds_in_vp2 {
357
+	status = "okay";
285
358
 };
286
359
 
287
360
 &edp_phy {
288
-  status = "okay";
289
-
361
+	status = "okay";
290
362
 };
291
363
 
292
364
 &edp_in_vp0 {
293
-    status = "disabled";
294
-};
295
-
296
-&edp_in_vp1 {
297
-    status = "okay";
298
-
299
-};
300
-
301
-&route_edp {
302
-    status = "okay";
303
-    connect = <&vp1_out_edp>;
304
-};
305
-
306
-&route_edp {
307
-	status = "okay";
308
-};
309
-/*
310
-*  edp_end
311
-*/
312
-
313
-/*
314
-*  Hdmi_start
315
-*/
316
-
317
-&hdmi {
318
-	status = "okay";
319
-	rockchip,phy-table =
320
-		<92812500  0x8009 0x0000 0x0270>,
321
-		<165000000 0x800b 0x0000 0x026d>,
322
-		<185625000 0x800b 0x0000 0x01ed>,
323
-		<297000000 0x800b 0x0000 0x01ad>,
324
-		<594000000 0x8029 0x0000 0x0088>,
325
-		<000000000 0x0000 0x0000 0x0000>;
326
-};
327
-
328
-&route_hdmi {
329
-	status = "okay";
330
-	connect = <&vp0_out_hdmi>;
331
-};
332
-
333
-&hdmi_in_vp0 {
334
-	status = "okay";
335
-};
336
-
337
-&hdmi_in_vp1 {
338
365
 	status = "disabled";
339
366
 };
340
367
 
341
-&hdmi_sound {
368
+&edp_in_vp1 {
342
369
 	status = "okay";
343
370
 };
344
-
345
-/*
346
- *  Hdmi_END
347
-*/
348
371
 
349
372
 &gmac0 {
350
373
 	phy-mode = "rgmii";
351
374
 	clock_in_out = "output";
352
375
 
353
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
376
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
354
377
 	snps,reset-active-low;
355
378
 	/* Reset time is 20ms, 100ms for rtl8211f */
356
379
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -370,7 +393,9 @@
370
393
 	rx_delay = <0x2f>;
371
394
 
372
395
 	phy-handle = <&rgmii_phy0>;
373
-	status = "disabled";
396
+	
397
+	status = "okay";
398
+	
374
399
 };
375
400
 
376
401
 &gmac1 {
..
..
@@ -404,9 +429,7 @@
404
429
  * power-supply should switche to vcc3v3_lcd1_n
405
430
  * when mipi panel is connected to dsi1.
406
431
  */
407
-&gt1x {
408
-	power-supply = <&vcc3v3_lcd0_n>;
409
-};
432
+
410
433
 
411
434
 &i2c3 {
412
435
 	status = "okay";
..
..
@@ -425,7 +448,7 @@
425
448
 };
426
449
 
427
450
 &i2c4 {
428
-	status = "okay";
451
+	status = "disabled";
429
452
 	gc8034: gc8034@37 {
430
453
 		compatible = "galaxycore,gc8034";
431
454
 		status = "okay";
..
..
@@ -471,7 +494,7 @@
471
494
 		};
472
495
 	};
473
496
 	ov5695: ov5695@36 {
474
-		status = "okay";
497
+		status = "disabled";
475
498
 		compatible = "ovti,ov5695";
476
499
 		reg = <0x36>;
477
500
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -494,19 +517,6 @@
494
517
 	};
495
518
 };
496
519
 
497
-&i2c5 {
498
-	status = "okay";
499
-
500
-	hym8563: hym8563@51 {
501
-		compatible = "haoyu,hym8563";
502
-		reg = <0x51>;
503
-		#clock-cells = <0>;
504
-		clock-frequency = <32768>;
505
-		clock-output-names = "xin32k";
506
-		/* rtc_int is not connected */
507
-	};
508
-};
509
-
510
520
 &mdio0 {
511
521
 	rgmii_phy0: phy@0 {
512
522
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -521,7 +531,13 @@
521
531
 	};
522
532
 };
523
533
 
534
+&video_phy0 {
535
+	status = "okay";
536
+};
524
537
 
538
+&video_phy1 {
539
+	status = "disabled";
540
+};
525
541
 
526
542
 &pcie30phy {
527
543
 	status = "okay";
..
..
@@ -533,38 +549,33 @@
533
549
 	status = "okay";
534
550
 };
535
551
 
552
+&pcie3x2 {
553
+	reset-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
554
+	vpcie3v3-supply = <&vcc3v3_pcie>;
555
+	status = "disabled";
556
+};
557
+
558
+&pcie3x1 {
559
+	rockchip,bifurcation;
560
+	reset-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
561
+	vpcie3v3-supply = <&vcc3v3_pcie>;
562
+	status = "okay";
563
+};
564
+
536
565
 &pinctrl {
537
-//	cam {
538
-//		camera_pwr: camera-pwr {
539
-//			rockchip,pins =
540
-//				/* camera power en */
541
-//				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
542
-//		};
543
-//	};
566
+
544
567
 	headphone {
545
568
 		hp_det: hp-det {
546
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
569
+			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
547
570
 		};
548
571
 	};
549
572
 
550
573
 	wireless-wlan {
551
574
 		wifi_host_wake_irq: wifi-host-wake-irq {
552
-			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
553
-		};
554
-	};
555
-
556
-	wireless-bluetooth {
557
-		uart1_gpios: uart1-gpios {
558
-			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
575
+			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
559
576
 		};
560
577
 	};
561
578
 	
562
-	lcd1 {
563
-        lcd1_rst_gpio: lcd1-rst-gpio {
564
-            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
565
-        };
566
-    };
567
-		
568
579
 	nk_io_init{
569
580
 		nk_io_gpio: nk-io-gpio{
570
581
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -574,19 +585,26 @@
574
585
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
575
586
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
576
587
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
577
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
588
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
578
589
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
579
590
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
580
591
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
581
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
582
592
 							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
583
593
 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
584
594
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
585
595
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
586
596
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
597
+							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
598
+							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
599
+							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
600
+							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
587
601
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
588
602
 		};
589
603
 	};
604
+};
605
+
606
+&rk809_sound {
607
+	hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
590
608
 };
591
609
 
592
610
 &rkisp {
..
..
@@ -611,32 +629,36 @@
611
629
 	};
612
630
 };
613
631
 
632
+&route_dsi0 {
633
+	status = "disabled";
634
+	connect = <&vp1_out_dsi0>;
635
+};
614
636
 
615
637
 
616
638
 
639
+&route_edp {
640
+	status = "disabled";
641
+	connect = <&vp1_out_edp>;
642
+};
617
643
 
618
644
 &sata2 {
619
645
 	status = "okay";
620
646
 };
621
647
 
622
648
 &sdmmc2 {
623
-        status = "disabled";
624
-};
625
-
626
-&sdmmc1 {
627
-        max-frequency = <150000000>;
628
-        supports-sdio;
629
-        bus-width = <4>;
630
-        disable-wp;
631
-        cap-sd-highspeed;
632
-        cap-sdio-irq;
633
-        keep-power-in-suspend;
634
-        mmc-pwrseq = <&sdio_pwrseq>;
635
-        non-removable;
636
-        pinctrl-names = "default";
637
-        pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
638
-        sd-uhs-sdr104;
639
-        status = "okay";
649
+	max-frequency = <150000000>;
650
+	supports-sdio;
651
+	bus-width = <4>;
652
+	disable-wp;
653
+	cap-sd-highspeed;
654
+	cap-sdio-irq;
655
+	keep-power-in-suspend;
656
+	mmc-pwrseq = <&sdio_pwrseq>;
657
+	non-removable;
658
+	pinctrl-names = "default";
659
+	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
660
+	sd-uhs-sdr104;
661
+	status = "okay";
640
662
 };
641
663
 
642
664
 &spdif_8ch {
..
..
@@ -669,22 +691,17 @@
669
691
 
670
692
 &wireless_bluetooth {
671
693
 	compatible = "bluetooth-platdata";
672
-	clocks = <&rk809 1>;
673
-	clock-names = "ext_clock";
674
-	//wifi-bt-power-toggle;
675
-	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
676
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
677
-	pinctrl-names = "default", "rts_gpio";
678
-	pinctrl-0 = <&uart1m0_rtsn>;
679
-	pinctrl-1 = <&uart1_gpios>;
680
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
681
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
682
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
683
694
 	status = "disabled";
684
695
 };
685
696
 
686
697
 &uart0 {
687
698
 	status = "okay";
699
+};
700
+
701
+&uart1 {	
702
+	pinctrl-names = "default";	
703
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
704
+	status = "disabled";		
688
705
 };
689
706
 
690
707
 &uart3 {
..
..
@@ -710,4 +727,4 @@
710
727
 &uart9 {
711
728
 	status = "okay";
712
729
 	pinctrl-0 = <&uart9m1_xfer>;
713
-};
730
+};