~hc/RK356X_SDK_RELEASE.git

..	..	@@ -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>;
..	..	@@ -82,7 +77,7 @@
82	77	regulator-max-microvolt = <3300000>;
83	78	vin-supply = <&vcc5v0_sys>;
84	79	};
85		-
	80	+#if 0
86	81	vcc_camera: vcc-camera-regulator {
87	82	compatible = "regulator-fixed";
88	83	gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
..	..	@@ -92,43 +87,197 @@
92	87	enable-active-high;
93	88	regulator-always-on;
94	89	regulator-boot-on;
95		-
96	90	};
	91	+#endif
97	92
	93	+#if 0
	94	+ leds: leds {
	95	+ compatible = "gpio-leds";
	96	+ sig_led: sig_led {
	97	+ gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
	98	+ default-state = "on";
	99	+ };
	100	+ };
	101	+
	102	+ leds: leds {
	103	+ compatible = "gpio-leds";
	104	+ err_led: err_led {
	105	+ gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
	106	+ default-state = "on";
	107	+ };
	108	+ };
	109	+#endif
	110	+
	111	+ ndj_io_init {
	112	+ compatible = "nk_io_control";
	113	+ pinctrl-names = "default";
	114	+ pinctrl-0 = <&nk_io_gpio>;
	115	+
	116	+ //gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
	117	+
	118	+ vcc_5v {
	119	+ gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
	120	+ gpio_function = <0>;
	121	+ };
	122	+
	123	+ vcc_12v {
	124	+ gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
	125	+ gpio_function = <0>;
	126	+ };
	127	+
	128	+ vcc_3.3v {
	129	+ gpio_num = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
	130	+ gpio_function = <0>;
	131	+ };
	132	+
	133	+ ax88772_rst {
	134	+ gpio_num = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>; //AX88772_RST_GPIO3_B5_3V3
	135	+ gpio_function = <3>;
	136	+ };
	137	+
	138	+ ax88631_rst {
	139	+ gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>; //AX88772_RST_GPIO3_B6_3V3
	140	+ gpio_function = <3>;
	141	+ };
	142	+/*
	143	+ hub_host3 {
	144	+ gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
	145	+ gpio_function = <0>;
	146	+ };
	147	+*/
	148	+ wake_4g {
	149	+ gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
	150	+ gpio_function = <0>;
	151	+ };
	152	+
	153	+ air_mode_4g {
	154	+ gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
	155	+ gpio_function = <0>;
	156	+ };
	157	+
	158	+ reset_4g {
	159	+ gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
	160	+ gpio_function = <3>;
	161	+ };
	162	+
	163	+ en_4g {
	164	+ gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
	165	+ gpio_function = <0>;
	166	+ };
	167	+
	168	+ //gpio99 {
	169	+ // gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
	170	+ // gpio_function = <1>;
	171	+ //};
	172	+
	173	+ wifi_power_en {
	174	+ gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
	175	+ gpio_function = <0>;
	176	+ };
	177	+ #if 0
	178	+ do1 {
	179	+ gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
	180	+ gpio_function = <0>;
	181	+ };
	182	+
	183	+ do2 {
	184	+ gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
	185	+ gpio_function = <0>;
	186	+ };
	187	+
	188	+ do3 {
	189	+ gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
	190	+ gpio_function = <0>;
	191	+ };
	192	+
	193	+ do4 {
	194	+ gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
	195	+ gpio_function = <0>;
	196	+ };
	197	+
	198	+ do5 {
	199	+ gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>;
	200	+ gpio_function = <0>;
	201	+ };
	202	+
	203	+ do6 {
	204	+ gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>;
	205	+ gpio_function = <0>;
	206	+ };
	207	+
	208	+ do7 {
	209	+ gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>;
	210	+ gpio_function = <0>;
	211	+ };
	212	+
	213	+ di1 {
	214	+ gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
	215	+ gpio_function = <1>;
	216	+ };
	217	+ #endif
	218	+ };
	219	+#if 0
98	220	nk_io_init {
99	221	compatible = "nk_io_control";
100		- hub_host2_5v_gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; //USB_HOST_PWREN_H_GPIO0_A6
101		- usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; //USB_EN_OC_GPIO0_A5
102		- lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
103		- lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
104		- vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
	222	+// vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
105	223	hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
106	224	hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
107		-// hub_host3_5V_rest_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
108	225	vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
109	226	vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
110	227	en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
111	228	reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
112	229	air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
113	230	wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
114		-
115		- edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
116		- edp_gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>; //7511_GPIO0-GPIO3_D2
117		- edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; //7511_GPIO1-GPIO3_D3
118		- edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; //7511_GPIO2-GPIO3_D4
119		- edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; //7511_GPIO3-GPIO3_D5
120		- edp_reset = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
121		-// tp_reset = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
122		-// vddio_mipi = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
123		-
124		- wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
125		-
126		- // pinctrl-names = "default";
127		-// pinctrl-0 = <&nk_io_gpio>;
128		- nodka_lvds = <9>;
	231	+ hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
	232	+// spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3
	233	+ wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
	234	+// pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4
	235	+ pinctrl-names = "default";
	236	+ pinctrl-0 = <&nk_io_gpio>;
129	237	};
	238	+#endif
	239	+ panel: panel {
	240	+ compatible = "simple-panel";
	241	+ backlight = <&backlight>;
	242	+ power-supply = <&vcc3v3_lcd0_n>;
	243	+ enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
	244	+ reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
	245	+ edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
	246	+ edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
	247	+ bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
	248	+ bpc = <8>;
	249	+ prepare-delay-ms = <200>;
	250	+ enable-delay-ms = <20>;
	251	+ lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2
	252	+ lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3
	253	+ lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4
	254	+ lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
	255	+ nodka-lvds = <15>;
130	256
131		-
	257	+ display-timings {
	258	+ native-mode = <&timing>;
	259	+ timing: timing {
	260	+ clock-frequency = <72500000>;
	261	+ hactive = <1280>;
	262	+ vactive = <800>;
	263	+ hfront-porch = <70>;
	264	+ hsync-len = <2>;
	265	+ hback-porch = <88>;
	266	+ vfront-porch = <7>;
	267	+ vsync-len = <4>;
	268	+ vback-porch = <17>;
	269	+ hsync-active = <21>;
	270	+ vsync-active = <0>;
	271	+ de-active = <0>;
	272	+ pixelclk-active = <0>;
	273	+ };
	274	+ };
	275	+ ports {
	276	+ panel_in_lvds: endpoint {
	277	+ remote-endpoint = <&lvds_out>;
	278	+ };
	279	+ };
	280	+ };
132	281	};
133	282
134	283	&combphy0_us {
..	..	@@ -144,11 +293,11 @@
144	293	};
145	294
146	295	&csi2_dphy_hw {
147		- status = "okay";
	296	+ status = "disabled";
148	297	};
149	298
150	299	&csi2_dphy0 {
151		- status = "okay";
	300	+ status = "disabled";
152	301
153	302	ports {
154	303	#address-cells = <1>;
..	..	@@ -191,8 +340,12 @@
191	340	* video_phy0 needs to be enabled
192	341	* when dsi0 is enabled
193	342	*/
	343	+&video_phy0 {
	344	+ status = "disabled";
	345	+};
	346	+
194	347	&dsi0 {
195		- status = "okay";
	348	+ status = "disabled";
196	349	};
197	350
198	351	&dsi0_in_vp0 {
..	..	@@ -200,7 +353,7 @@
200	353	};
201	354
202	355	&dsi0_in_vp1 {
203		- status = "okay";
	356	+ status = "disabled";
204	357	};
205	358
206	359	&dsi0_panel {
..	..	@@ -211,6 +364,10 @@
211	364	* video_phy1 needs to be enabled
212	365	* when dsi1 is enabled
213	366	*/
	367	+
	368	+&video_phy1 {
	369	+ status = "disabled";
	370	+};
214	371	&dsi1 {
215	372	status = "disabled";
216	373	};
..	..	@@ -224,31 +381,117 @@
224	381	};
225	382
226	383	&dsi1_panel {
227		- power-supply = <&vcc3v3_lcd1_n>;
	384	+// power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3
	385	+ vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
	386	+ reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
	387	+ vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
	388	+ pinctrl-names = "default";
	389	+ pinctrl-0 = <&lcd1_rst_gpio>;
228	390	};
229	391
	392	+&route_dsi1 {
	393	+ status = "disabled";
	394	+ connect = <&vp1_out_dsi1>;
	395	+};
	396	+
	397	+
	398	+/*
	399	+* edp_start
	400	+*/
	401	+
230	402	&edp {
231		- hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
232		- status = "okay";
	403	+ force-hpd;
	404	+ status = "disabled";
233	405	};
234	406
235	407	&edp_phy {
236		- status = "okay";
	408	+ status = "disabled";
237	409	};
238	410
239	411	&edp_in_vp0 {
240		- status = "okay";
	412	+ status = "disabled";
241	413	};
242	414
243	415	&edp_in_vp1 {
	416	+ status = "disabled";
	417	+
	418	+};
	419	+
	420	+&route_edp {
	421	+ status = "disabled";
	422	+ connect = <&vp1_out_edp>;
	423	+};
	424	+
	425	+&route_edp {
244	426	status = "disabled";
245	427	};
	428	+
	429	+&lvds {
	430	+ status = "disabled";
	431	+ ports {
	432	+ port@1 {
	433	+ reg = <1>;
	434	+ lvds_out:endpoint {
	435	+ remote-endpoint = <&panel_in_lvds>;
	436	+ };
	437	+ };
	438	+ };
	439	+};
	440	+
	441	+&route_lvds{
	442	+ status = "okay";
	443	+ connect = <&vp1_out_lvds>;
	444	+};
	445	+
	446	+&lvds_in_vp1 {
	447	+ status = "disabled";
	448	+};
	449	+
	450	+/*
	451	+* edp_end
	452	+*/
	453	+
	454	+/*
	455	+* Hdmi_start
	456	+*/
	457	+
	458	+&hdmi {
	459	+ status = "okay";
	460	+ rockchip,phy-table =
	461	+ <92812500 0x8009 0x0000 0x0270>,
	462	+ <165000000 0x800b 0x0000 0x026d>,
	463	+ <185625000 0x800b 0x0000 0x01ed>,
	464	+ <297000000 0x800b 0x0000 0x01ad>,
	465	+ <594000000 0x8029 0x0000 0x0088>,
	466	+ <000000000 0x0000 0x0000 0x0000>;
	467	+};
	468	+
	469	+&route_hdmi {
	470	+ status = "okay";
	471	+ connect = <&vp0_out_hdmi>;
	472	+};
	473	+
	474	+&hdmi_in_vp0 {
	475	+ status = "okay";
	476	+};
	477	+
	478	+&hdmi_in_vp1 {
	479	+ status = "disabled";
	480	+};
	481	+
	482	+&hdmi_sound {
	483	+ status = "okay";
	484	+};
	485	+
	486	+/*
	487	+ * Hdmi_END
	488	+*/
246	489
247	490	&gmac0 {
248	491	phy-mode = "rgmii";
249	492	clock_in_out = "output";
250	493
251		- snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
	494	+ snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
252	495	snps,reset-active-low;
253	496	/* Reset time is 20ms, 100ms for rtl8211f */
254	497	snps,reset-delays-us = <0 20000 100000>;
..	..	@@ -268,7 +511,9 @@
268	511	rx_delay = <0x2f>;
269	512
270	513	phy-handle = <&rgmii_phy0>;
	514	+
271	515	status = "disabled";
	516	+
272	517	};
273	518
274	519	&gmac1 {
..	..	@@ -302,9 +547,7 @@
302	547	* power-supply should switche to vcc3v3_lcd1_n
303	548	* when mipi panel is connected to dsi1.
304	549	*/
305		-&gt1x {
306		- power-supply = <&vcc3v3_lcd0_n>;
307		-};
	550	+
308	551
309	552	&i2c3 {
310	553	status = "okay";
..	..	@@ -320,13 +563,10 @@
320	563	compatible = "nk_mcu";
321	564	reg = <0x15>;
322	565	};
323		-
324		-
325		-
326	566	};
327	567
328	568	&i2c4 {
329		- status = "okay";
	569	+ status = "disabled";
330	570	gc8034: gc8034@37 {
331	571	compatible = "galaxycore,gc8034";
332	572	status = "okay";
..	..	@@ -338,7 +578,6 @@
338	578	reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
339	579	pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
340	580	rockchip,grf = <&grf>;
341		- power-domains = <&power RK3568_PD_VI>;
342	581	rockchip,camera-module-index = <0>;
343	582	rockchip,camera-module-facing = "back";
344	583	rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..	..	@@ -372,7 +611,7 @@
372	611	};
373	612	};
374	613	ov5695: ov5695@36 {
375		- status = "okay";
	614	+ status = "disabled";
376	615	compatible = "ovti,ov5695";
377	616	reg = <0x36>;
378	617	clocks = <&cru CLK_CIF_OUT>;
..	..	@@ -395,6 +634,19 @@
395	634	};
396	635	};
397	636
	637	+&i2c5 {
	638	+ status = "okay";
	639	+
	640	+ hym8563: hym8563@51 {
	641	+ compatible = "haoyu,hym8563";
	642	+ reg = <0x51>;
	643	+ #clock-cells = <0>;
	644	+ clock-frequency = <32768>;
	645	+ clock-output-names = "xin32k";
	646	+ /* rtc_int is not connected */
	647	+ };
	648	+};
	649	+
398	650	&mdio0 {
399	651	rgmii_phy0: phy@0 {
400	652	compatible = "ethernet-phy-ieee802.3-c22";
..	..	@@ -409,73 +661,103 @@
409	661	};
410	662	};
411	663
412		-&video_phy0 {
413		- status = "okay";
414		-};
415	664
416		-&video_phy1 {
	665	+
	666	+&pcie30phy {
417	667	status = "disabled";
418	668	};
419	669
420		-&pcie30phy {
421		- status = "okay";
422		-};
423		-
424		-&pcie3x2 {
425		- reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
	670	+&pcie2x1 {
	671	+ reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
426	672	vpcie3v3-supply = <&vcc3v3_pcie>;
427	673	status = "okay";
428	674	};
429	675
430	676	&pinctrl {
431		- cam {
432		- camera_pwr: camera-pwr {
433		- rockchip,pins =
434		- /* camera power en */
435		- <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
436		- };
437		- };
	677	+// cam {
	678	+// camera_pwr: camera-pwr {
	679	+// rockchip,pins =
	680	+// /* camera power en */
	681	+// <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
	682	+// };
	683	+// };
438	684	headphone {
439	685	hp_det: hp-det {
440		- rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
	686	+ rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
	687	+ <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
441	688	};
442	689	};
443	690
444	691	wireless-wlan {
445	692	wifi_host_wake_irq: wifi-host-wake-irq {
446		- rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
	693	+ rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
447	694	};
448	695	};
449	696
450	697	wireless-bluetooth {
451		- uart8_gpios: uart8-gpios {
452		- rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
	698	+ uart1_gpios: uart1-gpios {
	699	+ rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
453	700	};
454	701	};
	702	+
	703	+ lcd1 {
	704	+ lcd1_rst_gpio: lcd1-rst-gpio {
	705	+ rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
	706	+ };
	707	+ };
	708	+
	709	+ nk_io_init{
	710	+ nk_io_gpio: nk-io-gpio{
	711	+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
	712	+ <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
	713	+ <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
	714	+ <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
	715	+ <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
	716	+ <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
	717	+ <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
	718	+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
	719	+ <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
	720	+ <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
	721	+ <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
	722	+ <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
	723	+ <3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
	724	+ <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
	725	+ <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
	726	+ <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
	727	+ <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
	728	+ <3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
	729	+ <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
	730	+ <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3 DO1 8
	731	+ <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3 DO2 11
	732	+ <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3 DO3 12
	733	+ <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3 DO4 13
	734	+ <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3 DO5 14
	735	+
	736	+ <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3 DI1 16
	737	+ <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3 DI2 17
	738	+ <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3 DI3 18
	739	+ <0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3 DI4 19
	740	+ <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3 DI5 21
	741	+ <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
	742	+ <4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, //sig_led
	743	+ <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>, //err_led
	744	+ <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, //run_led
	745	+ <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; //HOST3_EN_GPIO4_B2_1V8
455	746
456		- nk_io_gpio: nk_io_gpio_col{
457		- rockchip,pins =
458		- <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,
459		- <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>,
460		- <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>,
461		- <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>,
462		- <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>,
463		- <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>,
464		- <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>,
465		- <3 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
	747	+ };
466	748	};
467	749	};
468	750
469	751	&rkisp {
470		- status = "okay";
	752	+ status = "disabled";
471	753	};
472	754
473	755	&rkisp_mmu {
474		- status = "okay";
	756	+ status = "disabled";
475	757	};
476	758
477	759	&rkisp_vir0 {
478		- status = "okay";
	760	+ status = "disabled";
479	761
480	762	port {
481	763	#address-cells = <1>;
..	..	@@ -488,34 +770,30 @@
488	770	};
489	771	};
490	772
491		-&route_dsi0 {
492		- status = "okay";
493		- connect = <&vp1_out_dsi0>;
494		-};
495	773
496		-&route_edp {
497		- status = "okay";
498		- connect = <&vp0_out_edp>;
499		-};
500	774
501	775	&sata2 {
502	776	status = "okay";
503	777	};
504	778
505	779	&sdmmc2 {
506		- max-frequency = <150000000>;
507		- supports-sdio;
508		- bus-width = <4>;
509		- disable-wp;
510		- cap-sd-highspeed;
511		- cap-sdio-irq;
512		- keep-power-in-suspend;
513		- mmc-pwrseq = <&sdio_pwrseq>;
514		- non-removable;
515		- pinctrl-names = "default";
516		- pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
517		- sd-uhs-sdr104;
518		- status = "okay";
	780	+ status = "disabled";
	781	+};
	782	+
	783	+&sdmmc1 {
	784	+ max-frequency = <150000000>;
	785	+ supports-sdio;
	786	+ bus-width = <4>;
	787	+ disable-wp;
	788	+ cap-sd-highspeed;
	789	+ cap-sdio-irq;
	790	+ keep-power-in-suspend;
	791	+ mmc-pwrseq = <&sdio_pwrseq>;
	792	+ non-removable;
	793	+ pinctrl-names = "default";
	794	+ pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
	795	+ sd-uhs-sdr104;
	796	+ status = "okay";
519	797	};
520	798
521	799	&spdif_8ch {
..	..	@@ -530,15 +808,6 @@
530	808	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
531	809	};
532	810
533		-&vcc3v3_lcd0_n {
534		- gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
535		- enable-active-high;
536		-};
537		-
538		-&vcc3v3_lcd1_n {
539		- gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
540		- enable-active-high;
541		-};
542	811
543	812	&wireless_wlan {
544	813	pinctrl-names = "default";
..	..	@@ -551,12 +820,53 @@
551	820	clocks = <&rk809 1>;
552	821	clock-names = "ext_clock";
553	822	//wifi-bt-power-toggle;
554		- uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
	823	+ uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
555	824	pinctrl-names = "default", "rts_gpio";
556		- pinctrl-0 = <&uart8m0_rtsn>;
557		- pinctrl-1 = <&uart8_gpios>;
558		- BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
559		- BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
560		- BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
	825	+ pinctrl-0 = <&uart1m0_rtsn>;
	826	+ pinctrl-1 = <&uart1_gpios>;
	827	+ BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
	828	+ BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
	829	+ BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
	830	+ status = "disabled";
	831	+};
	832	+
	833	+&uart0 {
	834	+ status = "disabled";
	835	+};
	836	+
	837	+&uart1 {
	838	+ pinctrl-names = "default";
	839	+ pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
	840	+ status = "disabled";
	841	+};
	842	+
	843	+&uart3 {
561	844	status = "okay";
	845	+ pinctrl-0 = <&uart3m1_xfer>;
	846	+};
	847	+
	848	+&uart4 {
	849	+ status = "disabled";
	850	+ pinctrl-0 = <&uart4m1_xfer>;
	851	+};
	852	+
	853	+&uart5 {
	854	+ status = "okay";
	855	+ pinctrl-0 = <&uart5m1_xfer>;
	856	+};
	857	+
	858	+
	859	+&uart7 {
	860	+ status = "okay";
	861	+ pinctrl-0 = <&uart7m1_xfer>;
	862	+};
	863	+
	864	+&uart8 {
	865	+ status = "disabled";
	866	+ pinctrl-0 = <&uart8m1_xfer>;
	867	+};
	868	+
	869	+&uart9 {
	870	+ status = "disabled";
	871	+ pinctrl-0 = <&uart9m1_xfer>;
562	872	};