~hc/RK356X_SDK_RELEASE.git

old mode 100644new mode 100755

..	..	@@ -8,12 +8,21 @@
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
14	15	/ {
15	16	model = "Rockchip RK3568 EVB1 DDR4 V10 Board";
16	17	compatible = "rockchip,rk3568-evb1-ddr4-v10", "rockchip,rk3568";
	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	+ };
17	26
18	27	vcc2v5_sys: vcc2v5-ddr {
19	28	compatible = "regulator-fixed";
..	..	@@ -25,15 +34,6 @@
25	34	vin-supply = <&vcc3v3_sys>;
26	35	};
27	36
28		- vcc3v3_vga: vcc3v3-vga {
29		- compatible = "regulator-fixed";
30		- regulator-name = "vcc3v3_vga";
31		- regulator-always-on;
32		- regulator-boot-on;
33		- gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
34		- enable-active-high;
35		- vin-supply = <&vcc3v3_sys>;
36		- };
37	37
38	38	pcie30_avdd0v9: pcie30-avdd0v9 {
39	39	compatible = "regulator-fixed";
..	..	@@ -60,7 +60,9 @@
60	60	regulator-name = "vcc3v3_pcie";
61	61	regulator-min-microvolt = <3300000>;
62	62	regulator-max-microvolt = <3300000>;
	63	+ regulator-always-on;
63	64	enable-active-high;
	65	+ regulator-boot-on;
64	66	gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
65	67	startup-delay-us = <5000>;
66	68	vin-supply = <&dc_12v>;
..	..	@@ -85,8 +87,25 @@
85	87	enable-active-high;
86	88	regulator-always-on;
87	89	regulator-boot-on;
88		- };
	90	+ };
89	91	#endif
	92	+
	93	+ leds: leds {
	94	+ compatible = "gpio-leds";
	95	+ sig_led: sig_led {
	96	+ gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
	97	+ default-state = "on";
	98	+ };
	99	+ };
	100	+
	101	+ leds: leds {
	102	+ compatible = "gpio-leds";
	103	+ err_led: err_led {
	104	+ gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
	105	+ default-state = "on";
	106	+ };
	107	+ };
	108	+
90	109
91	110	ndj_io_init {
92	111	compatible = "nk_io_control";
..	..	@@ -105,8 +124,18 @@
105	124	gpio_function = <0>;
106	125	};
107	126
108		- hub_host2_rst {
109		- gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
	127	+ vcc_3.3v {
	128	+ gpio_num = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
	129	+ gpio_function = <0>;
	130	+ };
	131	+
	132	+ ax88772_rst {
	133	+ gpio_num = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>; //AX88772_RST_GPIO3_B5_3V3
	134	+ gpio_function = <3>;
	135	+ };
	136	+
	137	+ ax88631_rst {
	138	+ gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>; //AX88772_RST_GPIO3_B6_3V3
110	139	gpio_function = <3>;
111	140	};
112	141
..	..	@@ -135,10 +164,10 @@
135	164	gpio_function = <0>;
136	165	};
137	166
138		- hp_en {
139		- gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
140		- gpio_function = <0>;
141		- };
	167	+ //gpio99 {
	168	+ // gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
	169	+ // gpio_function = <1>;
	170	+ //};
142	171
143	172	wifi_power_en {
144	173	gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
..	..	@@ -185,7 +214,69 @@
185	214	gpio_function = <1>;
186	215	};
187	216	#endif
188		-};
	217	+ };
	218	+#if 0
	219	+ nk_io_init {
	220	+ compatible = "nk_io_control";
	221	+// vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
	222	+ hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
	223	+ hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
	224	+ vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
	225	+ vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
	226	+ en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
	227	+ reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
	228	+ air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
	229	+ wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
	230	+ hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
	231	+// spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3
	232	+ wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
	233	+// pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4
	234	+ pinctrl-names = "default";
	235	+ pinctrl-0 = <&nk_io_gpio>;
	236	+ };
	237	+#endif
	238	+ panel: panel {
	239	+ compatible = "simple-panel";
	240	+ backlight = <&backlight>;
	241	+ power-supply = <&vcc3v3_lcd0_n>;
	242	+ enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
	243	+ reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
	244	+ edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
	245	+ edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
	246	+ bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
	247	+ bpc = <8>;
	248	+ prepare-delay-ms = <200>;
	249	+ enable-delay-ms = <20>;
	250	+ lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2
	251	+ lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3
	252	+ lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4
	253	+ lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
	254	+ nodka-lvds = <15>;
	255	+
	256	+ display-timings {
	257	+ native-mode = <&timing>;
	258	+ timing: timing {
	259	+ clock-frequency = <72500000>;
	260	+ hactive = <1280>;
	261	+ vactive = <800>;
	262	+ hfront-porch = <70>;
	263	+ hsync-len = <2>;
	264	+ hback-porch = <88>;
	265	+ vfront-porch = <7>;
	266	+ vsync-len = <4>;
	267	+ vback-porch = <17>;
	268	+ hsync-active = <21>;
	269	+ vsync-active = <0>;
	270	+ de-active = <0>;
	271	+ pixelclk-active = <0>;
	272	+ };
	273	+ };
	274	+ ports {
	275	+ panel_in_lvds: endpoint {
	276	+ remote-endpoint = <&lvds_out>;
	277	+ };
	278	+ };
	279	+ };
189	280	};
190	281
191	282	&combphy0_us {
..	..	@@ -248,6 +339,10 @@
248	339	* video_phy0 needs to be enabled
249	340	* when dsi0 is enabled
250	341	*/
	342	+&video_phy0 {
	343	+ status = "disabled";
	344	+};
	345	+
251	346	&dsi0 {
252	347	status = "disabled";
253	348	};
..	..	@@ -268,6 +363,10 @@
268	363	* video_phy1 needs to be enabled
269	364	* when dsi1 is enabled
270	365	*/
	366	+
	367	+&video_phy1 {
	368	+ status = "disabled";
	369	+};
271	370	&dsi1 {
272	371	status = "disabled";
273	372	};
..	..	@@ -281,31 +380,117 @@
281	380	};
282	381
283	382	&dsi1_panel {
284		- power-supply = <&vcc3v3_lcd1_n>;
	383	+// power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3
	384	+ vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
	385	+ reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
	386	+ vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
	387	+ pinctrl-names = "default";
	388	+ pinctrl-0 = <&lcd1_rst_gpio>;
285	389	};
286	390
	391	+&route_dsi1 {
	392	+ status = "disabled";
	393	+ connect = <&vp1_out_dsi1>;
	394	+};
	395	+
	396	+
	397	+/*
	398	+* edp_start
	399	+*/
	400	+
287	401	&edp {
288		- hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
289		- status = "okay";
	402	+ force-hpd;
	403	+ status = "disabled";
290	404	};
291	405
292	406	&edp_phy {
293		- status = "okay";
	407	+ status = "disabled";
294	408	};
295	409
296	410	&edp_in_vp0 {
297		- status = "okay";
	411	+ status = "disabled";
298	412	};
299	413
300	414	&edp_in_vp1 {
	415	+ status = "disabled";
	416	+
	417	+};
	418	+
	419	+&route_edp {
	420	+ status = "disabled";
	421	+ connect = <&vp1_out_edp>;
	422	+};
	423	+
	424	+&route_edp {
301	425	status = "disabled";
302	426	};
	427	+
	428	+&lvds {
	429	+ status = "disabled";
	430	+ ports {
	431	+ port@1 {
	432	+ reg = <1>;
	433	+ lvds_out:endpoint {
	434	+ remote-endpoint = <&panel_in_lvds>;
	435	+ };
	436	+ };
	437	+ };
	438	+};
	439	+
	440	+&route_lvds{
	441	+ status = "okay";
	442	+ connect = <&vp1_out_lvds>;
	443	+};
	444	+
	445	+&lvds_in_vp1 {
	446	+ status = "disabled";
	447	+};
	448	+
	449	+/*
	450	+* edp_end
	451	+*/
	452	+
	453	+/*
	454	+* Hdmi_start
	455	+*/
	456	+
	457	+&hdmi {
	458	+ status = "okay";
	459	+ rockchip,phy-table =
	460	+ <92812500 0x8009 0x0000 0x0270>,
	461	+ <165000000 0x800b 0x0000 0x026d>,
	462	+ <185625000 0x800b 0x0000 0x01ed>,
	463	+ <297000000 0x800b 0x0000 0x01ad>,
	464	+ <594000000 0x8029 0x0000 0x0088>,
	465	+ <000000000 0x0000 0x0000 0x0000>;
	466	+};
	467	+
	468	+&route_hdmi {
	469	+ status = "okay";
	470	+ connect = <&vp0_out_hdmi>;
	471	+};
	472	+
	473	+&hdmi_in_vp0 {
	474	+ status = "okay";
	475	+};
	476	+
	477	+&hdmi_in_vp1 {
	478	+ status = "disabled";
	479	+};
	480	+
	481	+&hdmi_sound {
	482	+ status = "okay";
	483	+};
	484	+
	485	+/*
	486	+ * Hdmi_END
	487	+*/
303	488
304	489	&gmac0 {
305	490	phy-mode = "rgmii";
306	491	clock_in_out = "output";
307	492
308		- snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
	493	+ snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
309	494	snps,reset-active-low;
310	495	/* Reset time is 20ms, 100ms for rtl8211f */
311	496	snps,reset-delays-us = <0 20000 100000>;
..	..	@@ -325,7 +510,9 @@
325	510	rx_delay = <0x2f>;
326	511
327	512	phy-handle = <&rgmii_phy0>;
	513	+
328	514	status = "disabled";
	515	+
329	516	};
330	517
331	518	&gmac1 {
..	..	@@ -359,8 +546,22 @@
359	546	* power-supply should switche to vcc3v3_lcd1_n
360	547	* when mipi panel is connected to dsi1.
361	548	*/
362		-&gt1x {
363		- power-supply = <&vcc3v3_lcd0_n>;
	549	+
	550	+
	551	+&i2c3 {
	552	+ status = "okay";
	553	+ //mac eeprom
	554	+ eeprom@51 {
	555	+ //compatible = "atmel,24c02";
	556	+ compatible = "atmel,24c256";
	557	+ reg = <0x51>;
	558	+ };
	559	+
	560	+ //nk-mcu
	561	+ nkmcu@15 {
	562	+ compatible = "nk_mcu";
	563	+ reg = <0x15>;
	564	+ };
364	565	};
365	566
366	567	&i2c4 {
..	..	@@ -376,7 +577,6 @@
376	577	reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
377	578	pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
378	579	rockchip,grf = <&grf>;
379		- power-domains = <&power RK3568_PD_VI>;
380	580	rockchip,camera-module-index = <0>;
381	581	rockchip,camera-module-facing = "back";
382	582	rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..	..	@@ -433,6 +633,19 @@
433	633	};
434	634	};
435	635
	636	+&i2c5 {
	637	+ status = "okay";
	638	+
	639	+ hym8563: hym8563@51 {
	640	+ compatible = "haoyu,hym8563";
	641	+ reg = <0x51>;
	642	+ #clock-cells = <0>;
	643	+ clock-frequency = <32768>;
	644	+ clock-output-names = "xin32k";
	645	+ /* rtc_int is not connected */
	646	+ };
	647	+};
	648	+
436	649	&mdio0 {
437	650	rgmii_phy0: phy@0 {
438	651	compatible = "ethernet-phy-ieee802.3-c22";
..	..	@@ -447,50 +660,51 @@
447	660	};
448	661	};
449	662
450		-&video_phy0 {
451		- status = "disabled";
452		-};
453	663
454		-&video_phy1 {
455		- status = "disabled";
456		-};
457	664
458	665	&pcie30phy {
459		- status = "okay";
	666	+ status = "disabled";
460	667	};
461	668
462		-&pcie3x2 {
463		- reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
	669	+&pcie2x1 {
	670	+ reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
464	671	vpcie3v3-supply = <&vcc3v3_pcie>;
465	672	status = "okay";
466	673	};
467	674
468	675	&pinctrl {
469		- cam {
470		- camera_pwr: camera-pwr {
471		- rockchip,pins =
472		- /* camera power en */
473		- <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
474		- };
475		- };
	676	+// cam {
	677	+// camera_pwr: camera-pwr {
	678	+// rockchip,pins =
	679	+// /* camera power en */
	680	+// <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
	681	+// };
	682	+// };
476	683	headphone {
477	684	hp_det: hp-det {
478		- rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
	685	+ rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
	686	+ <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
479	687	};
480	688	};
481	689
482	690	wireless-wlan {
483	691	wifi_host_wake_irq: wifi-host-wake-irq {
484		- rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
	692	+ rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
485	693	};
486	694	};
487	695
488	696	wireless-bluetooth {
489		- uart8_gpios: uart8-gpios {
490		- rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
	697	+ uart1_gpios: uart1-gpios {
	698	+ rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
491	699	};
492	700	};
493	701
	702	+ lcd1 {
	703	+ lcd1_rst_gpio: lcd1-rst-gpio {
	704	+ rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
	705	+ };
	706	+ };
	707	+
494	708	nk_io_init{
495	709	nk_io_gpio: nk-io-gpio{
496	710	rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..	..	@@ -500,7 +714,7 @@
500	714	<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
501	715	<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
502	716	<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
503		- <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
	717	+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
504	718	<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
505	719	<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
506	720	<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..	..	@@ -508,18 +722,24 @@
508	722	<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
509	723	<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
510	724	<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
	725	+ <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
	726	+ <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
	727	+ <3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
511	728	<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
512		- <2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
513		- <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
514		- <2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
515		- <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
	729	+ <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3 DO1 8
	730	+ <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3 DO2 11
	731	+ <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3 DO3 12
	732	+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3 DO4 13
	733	+ <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3 DO5 14
	734	+
	735	+ <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3 DI1 16
	736	+ <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3 DI2 17
	737	+ <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3 DI3 18
	738	+ <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3 DI4 19
	739	+ <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3 DI5 21
516	740	<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
517	741	};
518	742	};
519		-};
520		-
521		-&rk809_sound {
522		- hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
523	743	};
524	744
525	745	&rkisp {
..	..	@@ -531,7 +751,7 @@
531	751	};
532	752
533	753	&rkisp_vir0 {
534		- status = "okay";
	754	+ status = "disabled";
535	755
536	756	port {
537	757	#address-cells = <1>;
..	..	@@ -544,34 +764,30 @@
544	764	};
545	765	};
546	766
547		-&route_dsi0 {
548		- status = "disabled";
549		- connect = <&vp1_out_dsi0>;
550		-};
551	767
552		-&route_edp {
553		- status = "okay";
554		- connect = <&vp0_out_edp>;
555		-};
556	768
557	769	&sata2 {
558	770	status = "okay";
559	771	};
560	772
561	773	&sdmmc2 {
562		- max-frequency = <150000000>;
563		- supports-sdio;
564		- bus-width = <4>;
565		- disable-wp;
566		- cap-sd-highspeed;
567		- cap-sdio-irq;
568		- keep-power-in-suspend;
569		- mmc-pwrseq = <&sdio_pwrseq>;
570		- non-removable;
571		- pinctrl-names = "default";
572		- pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
573		- sd-uhs-sdr104;
574		- status = "okay";
	774	+ status = "disabled";
	775	+};
	776	+
	777	+&sdmmc1 {
	778	+ max-frequency = <150000000>;
	779	+ supports-sdio;
	780	+ bus-width = <4>;
	781	+ disable-wp;
	782	+ cap-sd-highspeed;
	783	+ cap-sdio-irq;
	784	+ keep-power-in-suspend;
	785	+ mmc-pwrseq = <&sdio_pwrseq>;
	786	+ non-removable;
	787	+ pinctrl-names = "default";
	788	+ pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
	789	+ sd-uhs-sdr104;
	790	+ status = "okay";
575	791	};
576	792
577	793	&spdif_8ch {
..	..	@@ -581,25 +797,16 @@
581	797	};
582	798
583	799	&uart8 {
584		- status = "okay";
	800	+ status = "disabled";
585	801	pinctrl-names = "default";
586	802	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
587	803	};
588	804
589		-&vcc3v3_lcd0_n {
590		- gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
591		- enable-active-high;
592		-};
593		-
594		-&vcc3v3_lcd1_n {
595		- gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
596		- enable-active-high;
597		-};
598	805
599	806	&wireless_wlan {
600	807	pinctrl-names = "default";
601	808	pinctrl-0 = <&wifi_host_wake_irq>;
602		- WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
	809	+ WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
603	810	};
604	811
605	812	&wireless_bluetooth {
..	..	@@ -607,12 +814,53 @@
607	814	clocks = <&rk809 1>;
608	815	clock-names = "ext_clock";
609	816	//wifi-bt-power-toggle;
610		- uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
	817	+ uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
611	818	pinctrl-names = "default", "rts_gpio";
612		- pinctrl-0 = <&uart8m0_rtsn>;
613		- pinctrl-1 = <&uart8_gpios>;
614		- BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
615		- BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
616		- BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
	819	+ pinctrl-0 = <&uart1m0_rtsn>;
	820	+ pinctrl-1 = <&uart1_gpios>;
	821	+ BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
	822	+ BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
	823	+ BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
	824	+ status = "disabled";
	825	+};
	826	+
	827	+&uart0 {
	828	+ status = "disabled";
	829	+};
	830	+
	831	+&uart1 {
	832	+ pinctrl-names = "default";
	833	+ pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
	834	+ status = "disabled";
	835	+};
	836	+
	837	+&uart3 {
617	838	status = "okay";
	839	+ pinctrl-0 = <&uart3m1_xfer>;
	840	+};
	841	+
	842	+&uart4 {
	843	+ status = "disabled";
	844	+ pinctrl-0 = <&uart4m1_xfer>;
	845	+};
	846	+
	847	+&uart5 {
	848	+ status = "okay";
	849	+ pinctrl-0 = <&uart5m1_xfer>;
	850	+};
	851	+
	852	+
	853	+&uart7 {
	854	+ status = "okay";
	855	+ pinctrl-0 = <&uart7m1_xfer>;
	856	+};
	857	+
	858	+&uart8 {
	859	+ status = "disabled";
	860	+ pinctrl-0 = <&uart8m1_xfer>;
	861	+};
	862	+
	863	+&uart9 {
	864	+ status = "disabled";
	865	+ pinctrl-0 = <&uart9m1_xfer>;
618	866	};