~hc/RK356X_SDK_RELEASE.git

..	..	@@ -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,8 +86,9 @@
87	86	enable-active-high;
88	87	regulator-always-on;
89	88	regulator-boot-on;
90		- };
	89	+ };
91	90	#endif
	91	+
92	92	ndj_io_init {
93	93	compatible = "nk_io_control";
94	94	pinctrl-names = "default";
..	..	@@ -141,52 +141,75 @@
141	141	gpio_function = <0>;
142	142	};
143	143
144		- wifi_power_en {
145		- gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
	144	+ usb_ogt {
	145	+ gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
146	146	gpio_function = <0>;
147	147	};
148		- };
149		-#if 0
150		- nk_io_init {
151		- compatible = "nk_io_control";
152		-// vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
153		- hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
154		- hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
155		- vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
156		- vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
157		- en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
158		- reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
159		- air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
160		- wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
161		- hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
162		-// spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3
163		- wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
164		-// pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4
165		- pinctrl-names = "default";
166		- pinctrl-0 = <&nk_io_gpio>;
167		- };
168		-#endif
169		- panel: panel {
	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 {
170	199	compatible = "simple-panel";
171	200	backlight = <&backlight>;
172	201	power-supply = <&vcc3v3_lcd0_n>;
173		- enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
174		- reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
175		- 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
176	204	edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
177	205	bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
178	206	bpc = <8>;
179	207	prepare-delay-ms = <200>;
180	208	enable-delay-ms = <20>;
181		- lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2
182		- lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3
183		- lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4
184		- lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
185		- nodka-lvds = <15>;
186	209
187	210	display-timings {
188		- native-mode = <&timing0>;
189		- timing0: timing0 {
	211	+ native-mode = <&timing>;
	212	+ timing: timing {
190	213	clock-frequency = <72500000>;
191	214	hactive = <1280>;
192	215	vactive = <800>;
..	..	@@ -203,8 +226,8 @@
203	226	};
204	227	};
205	228	ports {
206		- panel_in: endpoint {
207		- remote-endpoint = <&edp_out>;
	229	+ panel_in_lvds: endpoint {
	230	+ remote-endpoint = <&lvds_out>;
208	231	};
209	232	};
210	233	};
..	..	@@ -270,10 +293,6 @@
270	293	* video_phy0 needs to be enabled
271	294	* when dsi0 is enabled
272	295	*/
273		-&video_phy0 {
274		- status = "disabled";
275		-};
276		-
277	296	&dsi0 {
278	297	status = "disabled";
279	298	};
..	..	@@ -294,10 +313,6 @@
294	313	* video_phy1 needs to be enabled
295	314	* when dsi1 is enabled
296	315	*/
297		-
298		-&video_phy1 {
299		- status = "okay";
300		-};
301	316	&dsi1 {
302	317	status = "disabled";
303	318	};
..	..	@@ -307,108 +322,58 @@
307	322	};
308	323
309	324	&dsi1_in_vp1 {
310		- status = "okay";
	325	+ status = "disabled";
311	326	};
312	327
313	328	&dsi1_panel {
314		- power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3
315		- vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
316		- reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
317		- vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
318		- pinctrl-names = "default";
319		- pinctrl-0 = <&lcd1_rst_gpio>;
	329	+ power-supply = <&vcc3v3_lcd1_n>;
320	330	};
321		-
322		-&route_dsi1 {
323		- status = "disabled";
324		- connect = <&vp1_out_dsi1>;
325		-};
326		-
327		-
328		-/*
329		-* edp_start
330		-*/
331	331
332	332	&edp {
	333	+ //hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
333	334	force-hpd;
	335	+ status = "disabled";
	336	+};
	337	+
	338	+&lvds {
334	339	status = "okay";
335	340	ports {
336	341	port@1 {
337	342	reg = <1>;
338		- edp_out: endpoint {
339		- remote-endpoint = <&panel_in>;
	343	+ lvds_out: endpoint {
	344	+ remote-endpoint = <&panel_in_lvds>;
340	345	};
341	346	};
342		- };
	347	+
	348	+ };
	349	+};
	350	+
	351	+&route_lvds{
	352	+ status = "okay";
	353	+ connect = <&vp2_out_lvds>;
	354	+};
	355	+
	356	+&lvds_in_vp2 {
	357	+ status = "okay";
343	358	};
344	359
345	360	&edp_phy {
346		- status = "okay";
347		-
	361	+ status = "okay";
348	362	};
349	363
350	364	&edp_in_vp0 {
351		- status = "disabled";
352		-};
353		-
354		-&edp_in_vp1 {
355		- status = "okay";
356		-
357		-};
358		-
359		-&route_edp {
360		- status = "okay";
361		- connect = <&vp1_out_edp>;
362		-};
363		-
364		-&route_edp {
365		- status = "okay";
366		-};
367		-/*
368		-* edp_end
369		-*/
370		-
371		-/*
372		-* Hdmi_start
373		-*/
374		-
375		-&hdmi {
376		- status = "okay";
377		- rockchip,phy-table =
378		- <92812500 0x8009 0x0000 0x0270>,
379		- <165000000 0x800b 0x0000 0x026d>,
380		- <185625000 0x800b 0x0000 0x01ed>,
381		- <297000000 0x800b 0x0000 0x01ad>,
382		- <594000000 0x8029 0x0000 0x0088>,
383		- <000000000 0x0000 0x0000 0x0000>;
384		-};
385		-
386		-&route_hdmi {
387		- status = "okay";
388		- connect = <&vp0_out_hdmi>;
389		-};
390		-
391		-&hdmi_in_vp0 {
392		- status = "okay";
393		-};
394		-
395		-&hdmi_in_vp1 {
396	365	status = "disabled";
397	366	};
398	367
399		-&hdmi_sound {
	368	+&edp_in_vp1 {
400	369	status = "okay";
401	370	};
402		-
403		-/*
404		- * Hdmi_END
405		-*/
406	371
407	372	&gmac0 {
408	373	phy-mode = "rgmii";
409	374	clock_in_out = "output";
410	375
411		- snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
	376	+ snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
412	377	snps,reset-active-low;
413	378	/* Reset time is 20ms, 100ms for rtl8211f */
414	379	snps,reset-delays-us = <0 20000 100000>;
..	..	@@ -428,7 +393,9 @@
428	393	rx_delay = <0x2f>;
429	394
430	395	phy-handle = <&rgmii_phy0>;
431		- status = "disabled";
	396	+
	397	+ status = "okay";
	398	+
432	399	};
433	400
434	401	&gmac1 {
..	..	@@ -462,9 +429,7 @@
462	429	* power-supply should switche to vcc3v3_lcd1_n
463	430	* when mipi panel is connected to dsi1.
464	431	*/
465		-&gt1x {
466		- power-supply = <&vcc3v3_lcd0_n>;
467		-};
	432	+
468	433
469	434	&i2c3 {
470	435	status = "okay";
..	..	@@ -483,7 +448,7 @@
483	448	};
484	449
485	450	&i2c4 {
486		- status = "okay";
	451	+ status = "disabled";
487	452	gc8034: gc8034@37 {
488	453	compatible = "galaxycore,gc8034";
489	454	status = "okay";
..	..	@@ -529,7 +494,7 @@
529	494	};
530	495	};
531	496	ov5695: ov5695@36 {
532		- status = "okay";
	497	+ status = "disabled";
533	498	compatible = "ovti,ov5695";
534	499	reg = <0x36>;
535	500	clocks = <&cru CLK_CIF_OUT>;
..	..	@@ -552,19 +517,6 @@
552	517	};
553	518	};
554	519
555		-&i2c5 {
556		- status = "okay";
557		-
558		- hym8563: hym8563@51 {
559		- compatible = "haoyu,hym8563";
560		- reg = <0x51>;
561		- #clock-cells = <0>;
562		- clock-frequency = <32768>;
563		- clock-output-names = "xin32k";
564		- /* rtc_int is not connected */
565		- };
566		-};
567		-
568	520	&mdio0 {
569	521	rgmii_phy0: phy@0 {
570	522	compatible = "ethernet-phy-ieee802.3-c22";
..	..	@@ -579,7 +531,13 @@
579	531	};
580	532	};
581	533
	534	+&video_phy0 {
	535	+ status = "okay";
	536	+};
582	537
	538	+&video_phy1 {
	539	+ status = "disabled";
	540	+};
583	541
584	542	&pcie30phy {
585	543	status = "okay";
..	..	@@ -591,39 +549,33 @@
591	549	status = "okay";
592	550	};
593	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	+
594	565	&pinctrl {
595		-// cam {
596		-// camera_pwr: camera-pwr {
597		-// rockchip,pins =
598		-// /* camera power en */
599		-// <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
600		-// };
601		-// };
	566	+
602	567	headphone {
603	568	hp_det: hp-det {
604		- rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
605		- <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
	569	+ rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
606	570	};
607	571	};
608	572
609	573	wireless-wlan {
610	574	wifi_host_wake_irq: wifi-host-wake-irq {
611		- rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
612		- };
613		- };
614		-
615		- wireless-bluetooth {
616		- uart1_gpios: uart1-gpios {
617		- rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
	575	+ rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
618	576	};
619	577	};
620	578
621		- lcd1 {
622		- lcd1_rst_gpio: lcd1-rst-gpio {
623		- rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
624		- };
625		- };
626		-
627	579	nk_io_init{
628	580	nk_io_gpio: nk-io-gpio{
629	581	rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..	..	@@ -633,7 +585,7 @@
633	585	<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
634	586	<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
635	587	<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
636		- <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
	588	+ <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
637	589	<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
638	590	<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
639	591	<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..	..	@@ -649,6 +601,10 @@
649	601	<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
650	602	};
651	603	};
	604	+};
	605	+
	606	+&rk809_sound {
	607	+ hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
652	608	};
653	609
654	610	&rkisp {
..	..	@@ -673,32 +629,36 @@
673	629	};
674	630	};
675	631
	632	+&route_dsi0 {
	633	+ status = "disabled";
	634	+ connect = <&vp1_out_dsi0>;
	635	+};
676	636
677	637
678	638
	639	+&route_edp {
	640	+ status = "disabled";
	641	+ connect = <&vp1_out_edp>;
	642	+};
679	643
680	644	&sata2 {
681	645	status = "okay";
682	646	};
683	647
684	648	&sdmmc2 {
685		- status = "disabled";
686		-};
687		-
688		-&sdmmc1 {
689		- max-frequency = <150000000>;
690		- supports-sdio;
691		- bus-width = <4>;
692		- disable-wp;
693		- cap-sd-highspeed;
694		- cap-sdio-irq;
695		- keep-power-in-suspend;
696		- mmc-pwrseq = <&sdio_pwrseq>;
697		- non-removable;
698		- pinctrl-names = "default";
699		- pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
700		- sd-uhs-sdr104;
701		- 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";
702	662	};
703	663
704	664	&spdif_8ch {
..	..	@@ -731,17 +691,7 @@
731	691
732	692	&wireless_bluetooth {
733	693	compatible = "bluetooth-platdata";
734		- clocks = <&rk809 1>;
735		- clock-names = "ext_clock";
736		- //wifi-bt-power-toggle;
737		- uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
738		- pinctrl-names = "default", "rts_gpio";
739		- pinctrl-0 = <&uart1m0_rtsn>;
740		- pinctrl-1 = <&uart1_gpios>;
741		- BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
742		- BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
743		- BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
744		- status = "okay";
	694	+ status = "disabled";
745	695	};
746	696
747	697	&uart0 {
..	..	@@ -751,7 +701,7 @@
751	701	&uart1 {
752	702	pinctrl-names = "default";
753	703	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
754		- status = "okay";
	704	+ status = "disabled";
755	705	};
756	706
757	707	&uart3 {
..	..	@@ -777,4 +727,4 @@
777	727	&uart9 {
778	728	status = "okay";
779	729	pinctrl-0 = <&uart9m1_xfer>;
780		-};
	730	+};