~lzh/A133.git

..	..	@@ -7,6 +7,7 @@
7	7	/dts-v1/;
8	8	#include "sun50iw10p1.dtsi"
9	9
	10	+
10	11	/{
11	12	model = "sun50iw10";
12	13	compatible = "allwinner,a133", "arm,sun50iw10p1";
..	..	@@ -18,7 +19,7 @@
18	19
19	20	reg_usb1_vbus: usb1-vbus {
20	21	compatible = "regulator-fixed";
21		- //gpio = <&r_pio PL 11 1 2 0 1>;
	22	+ gpio = <&r_pio PL 8 1 2 0 1>;
22	23	regulator-name = "usb1-vbus";
23	24	regulator-min-microvolt = <5000000>;
24	25	regulator-max-microvolt = <5000000>;
..	..	@@ -26,7 +27,7 @@
26	27	enable-active-high;
27	28	};
28	29
29		- soc@03000000 {
	30	+ soc: soc@03000000 {
30	31
31	32	r_pio: pinctrl@07022000 {
32	33
..	..	@@ -100,7 +101,7 @@
100	101	};
101	102
102	103	twi3_pins_a: twi3@0 {
103		- allwinner,pins = "PE3", "PE4";
	104	+ allwinner,pins = "PH12", "PH13";
104	105	allwinner,pname = "twi3_scl", "twi3_sda";
105	106	allwinner,function = "twi3";
106	107	allwinner,muxsel = <2>;
..	..	@@ -109,13 +110,13 @@
109	110	};
110	111
111	112	twi3_pins_b: twi3@1 {
112		- allwinner,pins = "PE3", "PE4";
	113	+ allwinner,pins = "PH12", "PH13";
113	114	allwinner,function = "io_disabled";
114	115	allwinner,muxsel = <7>;
115	116	allwinner,drive = <1>;
116	117	allwinner,pull = <0>;
117	118	};
118		-
	119	+/*
119	120	pwm0_pin_a: pwm0@0 {
120	121	//allwinner,pins = "PD23";
121	122	allwinner,function = "pwm0";
..	..	@@ -151,7 +152,7 @@
151	152	allwinner,pull = <0>;
152	153	allwinner,data = <0xffffffff>;
153	154	};
154		-
	155	+*/
155	156	pwm2_pin_a: pwm2@0 {
156	157	allwinner,pins = "PD20";
157	158	allwinner,function = "pwm2";
..	..	@@ -169,7 +170,7 @@
169	170	allwinner,pull = <0>;
170	171	allwinner,data = <0xffffffff>;
171	172	};
172		-
	173	+/*
173	174	pwm3_pin_a: pwm3@0 {
174	175	allwinner,pins = "PD21";
175	176	allwinner,function = "pwm3";
..	..	@@ -187,7 +188,7 @@
187	188	allwinner,pull = <0>;
188	189	allwinner,data = <0xffffffff>;
189	190	};
190		-
	191	+*/
191	192	spi0_pins_a: spi0@0 {
192	193	allwinner,pins = "PC2", "PC4", "PC12", "PC15", "PC16";
193	194	allwinner,pname = "spi0_mosi", "spi0_miso",
..	..	@@ -214,6 +215,7 @@
214	215	allwinner,drive = <1>;
215	216	allwinner,pull = <0>;
216	217	};
	218	+/*
217	219	spi1_pins_a: spi1@0 {
218	220	allwinner,pins = "PD11", "PD12", "PD13";
219	221	allwinner,pname = "spi1_sclk", "spi1_mosi",
..	..	@@ -230,7 +232,7 @@
230	232	allwinner,function = "spi1";
231	233	allwinner,muxsel = <4>;
232	234	allwinner,drive = <1>;
233		- allwinner,pull = <1>; /* only CS should be pulled up */
	235	+ allwinner,pull = <1>; // only CS should be pulled up
234	236	};
235	237
236	238	spi1_pins_c: spi1@2 {
..	..	@@ -275,6 +277,7 @@
275	277	allwinner,drive = <1>;
276	278	allwinner,pull = <0>;
277	279	};
	280	+*/
278	281	};
279	282
280	283	twi0: twi@0x05002000{
..	..	@@ -295,8 +298,8 @@
295	298	ctp_revert_x_flag = <0x1>;
296	299	ctp_revert_y_flag = <0x1>;
297	300	ctp_exchange_x_y_flag = <0x0>;
298		- ctp_int_port = <&r_pio PL 7 3 0xffffffff 0xffffffff 0>;
299		- ctp_wakeup = <&pio PB 2 1 0xffffffff 0xffffffff 1>;
	301	+ ctp_int_port = <&pio PE 3 3 0xffffffff 0xffffffff 0>;
	302	+ ctp_wakeup = <&pio PE 4 1 0xffffffff 0xffffffff 1>;
300	303	ctp_power_ldo = <3300>;
301	304	ctp_power_ldo_vol = <3300>;
302	305	ctp_power = <3300>;
..	..	@@ -327,14 +330,14 @@
327	330	//irq_gpio = <&pio PH 11 6 0xffffffff 0xffffffff 0>;
328	331	};
329	332	};
330		-
	333	+/*
331	334	pwm3: pwm3@0300a000 {
332	335	pinctrl-names = "active", "sleep";
333	336	pinctrl-0 = <&pwm3_pin_a>;
334	337	pinctrl-1 = <&pwm3_pin_b>;
335		- status = "okay";
	338	+ status = "disabled";
336	339	};
337		-
	340	+*/
338	341	pwm2: pwm2@0300a000 {
339	342	pinctrl-names = "active", "sleep";
340	343	pinctrl-0 = <&pwm2_pin_a>;
..	..	@@ -347,46 +350,7 @@
347	350	pinctrl-0 = <&twi1_pins_a>;
348	351	pinctrl-1 = <&twi1_pins_b>;
349	352	status = "okay";
350		- gsensor {
351		- compatible = "allwinner,sc7a20";
352		- reg = <0x19>;
353		- device_type = "gsensor";
354		- status = "disabled";
355		- gsensor_twi_id = <0x1>;
356		- gsensor_twi_addr = <0x19>;
357		- //gsensor_int1 = <&pio PH 11 6 1 0xffffffff 0xffffffff>;
358		- gsensor-supply = <&reg_dcdc1>;
359		- gsensor_vcc_io_val = <3300>;
360		- };
361		- lightsensor {
362		- compatible = "allwinner,stk3x1x";
363		- reg = <0x48>;
364		- device_type = "lightsensor";
365		- status = "disabled";
366		- ls_twi_id = <0x1>;
367		- ls_twi_addr = <0x48>;
368		- //ls_int = <&pio PH 4 6 1 0xffffffff 0xffffffff>;
369		- lightsensor-supply = <&reg_dcdc1>;
370		- };
371		- pcf85063@51 {
372		- compatible = "haoyu,hym8563";
373		- reg = <0x51>;
374		- status = "okay";
375		- };
376		- mpu6050@68 {
377		- compatible = "invensense,mpu6500";
378		- reg = <0x68>;
379		- mount-matrix = "-0.984807753012208", /* x0 */
380		- "0", /* y0 */
381		- "-0.173648177666930", /* z0 */
382		- "0", /* x1 */
383		- "-1", /* y1 */
384		- "0", /* z1 */
385		- "-0.173648177666930", /* x2 */
386		- "0", /* y2 */
387		- "0.984807753012208"; /* z2 */
388		- status = "disabled";
389		- };
	353	+ // EXTEND GPIO
390	354	};
391	355
392	356	twi2: twi@0x05002800{
..	..	@@ -394,21 +358,23 @@
394	358	pinctrl-0 = <&twi2_pins_a>;
395	359	pinctrl-1 = <&twi2_pins_b>;
396	360	twi-supply = <&reg_dldo2>;
397		- status = "ok";
	361	+ status = "okay";
	362	+ // CAMERA1
398	363
399		-/* ac107@36 {
400		- compatible = "Allwinnertech,ac107_0";
401		- gpio-reset = "null";
402		- reg = <0x36>;
403		- status = "okay";
404		- }; */
	364	+ // CAMERA2
405	365	};
406	366
407	367	twi3: twi@0x05002c00{
408	368	clock-frequency = <200000>;
409	369	pinctrl-0 = <&twi3_pins_a>;
410	370	pinctrl-1 = <&twi3_pins_b>;
411		- status = "ok";
	371	+ status = "okay";
	372	+ // RTC
	373	+ pcf8563@51 {
	374	+ compatible = "haoyu,hym8563";
	375	+ reg = <0x51>;
	376	+ status = "okay";
	377	+ };
412	378	};
413	379
414	380	twi6: s_twi@0x07081400{
..	..	@@ -642,15 +608,20 @@
642	608	};
643	609	reg_dldo1: dldo1 {
644	610	regulator-name = "axp803-dldo1";
645		- regulator-min-microvolt = <700000>;
646		- regulator-max-microvolt = <3300000>;
	611	+ regulator-min-microvolt = <1800000>;
	612	+ regulator-max-microvolt = <1900000>;
647	613	regulator-enable-ramp-delay = <1000>;
	614	+ regulator-always-on;
	615	+ regulator-boot-on;
648	616	};
649	617	reg_dldo2: dldo2 {
650	618	regulator-name = "axp803-dldo2";
651	619	regulator-min-microvolt = <700000>;
652	620	regulator-max-microvolt = <4200000>;
653	621	regulator-enable-ramp-delay = <1000>;
	622	+ regulator-always-on;
	623	+ regulator-boot-on;
	624	+ // kickpi
654	625	};
655	626	reg_dldo3: dldo3 {
656	627	regulator-name = "axp803-dldo3";
..	..	@@ -681,6 +652,9 @@
681	652	regulator-min-microvolt = <700000>;
682	653	regulator-max-microvolt = <1900000>;
683	654	regulator-enable-ramp-delay = <1000>;
	655	+ regulator-always-on;
	656	+ regulator-boot-on;
	657	+ // kickpi
684	658	};
685	659	reg_fldo1: fldo1 {
686	660	regulator-name = "axp803-fldo1";
..	..	@@ -832,7 +806,7 @@
832	806
833	807	osc24m-on = <0x1>;
834	808	};
835		-
	809	+/*
836	810	pwm0: pwm0@0300a000 {
837	811	pinctrl-names = "active", "sleep";
838	812	pinctrl-0 = <&pwm0_pin_a>;
..	..	@@ -852,7 +826,7 @@
852	826	spi_slave_mode = <0>;
853	827	status = "disabled";
854	828	};
855		-
	829	+*/
856	830	gpadc:gpadc{
857	831	channel_num = <1>;
858	832	channel_select = <0x01>;
..	..	@@ -923,8 +897,7 @@
923	897	device_type = "usbc0";
924	898	usb_port_type = <0x0>;
925	899	usb_detect_type = <0x1>;
926		- //usb_id_gpio = <&pio PH 8 0 0 0xffffffff 0xffffffff>;
927		- usb_id_gpio = <&r_pio PL 10 0 0 0xffffffff 0xffffffff>;
	900	+ usb_id_gpio = <&r_pio PL 9 0 0 0xffffffff 0xffffffff>;
928	901	usb_det_vbus_gpio = "axp_ctrl";
929	902	usb_regulator_io = "nocare";
930	903	det_vbus_supply = <&usb_power_supply>;
..	..	@@ -963,23 +936,26 @@
963	936	};
964	937
965	938	sdc1: sdmmc@04021000 {
966		- bus-width = <4>;
967		- no-mmc;
968		- no-sd;
969		- cap-sd-highspeed;
970		- /sd-uhs-sdr12/
971		- /sd-uhs-sdr25/
972		- /sd-uhs-sdr50;/
973		- /sd-uhs-ddr50;/
974		- /sd-uhs-sdr104/
975		- /sunxi-power-save-mode;/
976		- /sunxi-dis-signal-vol-sw;/
977		- cap-sdio-irq;
978		- keep-power-in-suspend;
979		- ignore-pm-notify;
980		- max-frequency = <50000000>;
981		- ctl-spec-caps = <0x8>;
982		- status = "okay";
	939	+ bus-width = <4>;
	940	+ no-mmc;
	941	+ no-sd;
	942	+ cap-sd-highspeed;
	943	+ /sd-uhs-sdr12/
	944	+ /sd-uhs-sdr25/
	945	+ sd-uhs-sdr50;
	946	+ sd-uhs-ddr50;
	947	+ sd-uhs-sdr104;
	948	+ // kickpi
	949	+ //sunxi-power-save-mode;
	950	+ /sunxi-dis-signal-vol-sw;/
	951	+ sdio-used-1v8;
	952	+ cap-sdio-irq;
	953	+ keep-power-in-suspend;
	954	+ ignore-pm-notify;
	955	+ max-frequency = <50000000>;
	956	+ ctl-spec-caps = <0x8>;
	957	+ status = "okay";
	958	+
983	959	};
984	960
985	961	/* gpio-spk will output 0x00 when playing audio */
..	..	@@ -1001,7 +977,7 @@
1001	977	/* Pa enabled about */
1002	978	pa_level = <0x00>;
1003	979	pa_msleep_time = <0x78>;
1004		- gpio-spk = <&pio PH 17 1 1 1 1>;
	980	+ //gpio-spk = <&pio PB 7 1 1 1 1>;
1005	981	/* regulator about */
1006	982	avcc-supply = <&reg_aldo1>;
1007	983	cpvin-supply = <&reg_eldo1>;
..	..	@@ -1041,7 +1017,7 @@
1041	1017	daudio_master = <0x04>;
1042	1018	signal_inversion = <0x01>;
1043	1019	slot_width_select = <0x20>;
1044		- status = "disabled";
	1020	+ status = "okay";
1045	1021	};
1046	1022
1047	1023	snddaudio0:sound@3 {
..	..	@@ -1050,7 +1026,7 @@
1050	1026
1051	1027	/* sunxi,snddaudio-codec = "ac107.1-0036";
1052	1028	sunxi,snddaudio-codec-dai = "ac107-pcm0"; */
1053		- status = "disabled";
	1029	+ status = "okay";
1054	1030	};
1055	1031
1056	1032	daudio1:daudio@0x05091000 {
..	..	@@ -1116,7 +1092,7 @@
1116	1092	vind0:vind@0 {
1117	1093	vind0_clk = <336000000>;
1118	1094	vind0_isp = <300000000>;
1119		- status = "okay";
	1095	+ status = "disabled";
1120	1096
1121	1097	actuator0:actuator@0 {
1122	1098	device_type = "actuator0";
..	..	@@ -1231,203 +1207,14 @@
1231	1207	status = "okay";
1232	1208	};
1233	1209	};
1234		-/*----------------------------------------------------------------------------------
1235		-disp init configuration
1236	1210
1237		-disp_mode (0:screen0<screen0,fb0>)
1238		-screenx_output_type (0:none; 1:lcd; 2:tv; 3:hdmi;5:vdpo)
1239		-screenx_output_mode (used for hdmi output, 0:480i 1:576i 2:480p 3:576p 4:720p50)
1240		- (5:720p60 6:1080i50 7:1080i60 8:1080p24 9:1080p50 10:1080p60)
1241		-screenx_output_format (for hdmi, 0:RGB 1:yuv444 2:yuv422 3:yuv420)
1242		-screenx_output_bits (for hdmi, 0:8bit 1:10bit 2:12bit 2:16bit)
1243		-screenx_output_eotf (for hdmi, 0:reserve 4:SDR 16:HDR10 18:HLG)
1244		-screenx_output_cs (for hdmi, 0:undefined 257:BT709 260:BT601 263:BT2020)
1245		-screenx_output_dvi_hdmi (for hdmi, 0:undefined 1:dvi mode 2:hdmi mode)
1246		-screen0_output_range (for hdmi, 0:default 1:full 2:limited)
1247		-screen0_output_scan (for hdmi, 0:no data 1:overscan 2:underscan)
1248		-screen0_output_aspect_ratio (for hdmi, 8-same as original picture 9-4:3 10-16:9 11-14:9)
1249		-fbx format (4:RGB655 5:RGB565 6:RGB556 7:ARGB1555 8:RGBA5551 9:RGB888 10:ARGB8888 12:ARGB4444)
1250		-fbx pixel sequence (0:ARGB 1:BGRA 2:ABGR 3:RGBA)
1251		-fb0_scaler_mode_enable(scaler mode enable, used FE)
1252		-fbx_width,fbx_height (framebuffer horizontal/vertical pixels, fix to output resolution while equal 0)
1253		-lcdx_backlight (lcd init backlight,the range:[0,256],default:197
1254		-lcdx_yy (lcd init screen bright/contrast/saturation/hue, value:0~100, default:50/50/57/50)
1255		-lcd0_contrast (LCD contrast, 0~100)
1256		-lcd0_saturation (LCD saturation, 0~100)
1257		-lcd0_hue (LCD hue, 0~100)
1258		-framebuffer software rotation setting:
1259		-disp_rotation_used: (0:disable; 1:enable,you must set fbX_width to lcd_y,
1260		-set fbX_height to lcd_x)
1261		-degreeX: (X:screen index; 0:0 degree; 1:90 degree; 3:270 degree)
1262		-degreeX_Y: (X:screen index; Y:layer index 0~15; 0:0 degree; 1:90 degree; 3:270 degree)
1263		-devX_output_type : config output type in bootGUI framework in UBOOT-2018.
1264		- (0:none; 1:lcd; 2:tv; 4:hdmi;)
1265		-devX_output_mode : config output resolution(see include/video/sunxi_display2.h) of bootGUI framework in UBOOT-2018
1266		-devX_screen_id : config display index of bootGUI framework in UBOOT-2018
1267		-devX_do_hpd : whether do hpd detectation or not in UBOOT-2018
1268		-chn_cfg_mode : Hardware DE channel allocation config. 0:single display with 6
1269		- channel, 1:dual display with 4 channel in main display and 2 channel in second
1270		- display, 2:dual display with 3 channel in main display and 3 channel in second
1271		- in display.
1272		-----------------------------------------------------------------------------------*/
1273		- disp: disp@06000000 {
1274		- disp_init_enable = <1>;
1275		- disp_mode = <0>;
1276		-
1277		- screen0_output_type = <1>;
1278		- screen0_output_mode = <4>;
1279		-
1280		- screen1_output_type = <1>;
1281		- screen1_output_mode = <4>;
1282		-
1283		- screen1_output_format = <0>;
1284		- screen1_output_bits = <0>;
1285		- screen1_output_eotf = <4>;
1286		- screen1_output_cs = <257>;
1287		- screen1_output_dvi_hdmi = <2>;
1288		- screen1_output_range = <2>;
1289		- screen1_output_scan = <0>;
1290		- screen1_output_aspect_ratio = <8>;
1291		-
1292		- dev0_output_type = <1>;
1293		- dev0_output_mode = <4>;
1294		- dev0_screen_id = <0>;
1295		- dev0_do_hpd = <0>;
1296		-
1297		- dev1_output_type = <4>;
1298		- dev1_output_mode = <10>;
1299		- dev1_screen_id = <1>;
1300		- dev1_do_hpd = <1>;
1301		-
1302		- def_output_dev = <0>;
1303		- hdmi_mode_check = <1>;
1304		-
1305		- fb0_format = <0>;
1306		- fb0_width = <1024>;
1307		- fb0_height = <600>;
1308		-
1309		- fb1_format = <0>;
1310		- fb1_width = <0>;
1311		- fb1_height = <0>;
1312		- chn_cfg_mode = <1>;
1313		-
1314		- disp_para_zone = <1>;
1315		- dc1sw-supply = <&reg_dc1sw>;
1316		- eldo3-supply = <&reg_eldo3>;
1317		- dcdc1-supply = <&reg_dcdc1>;
1318		- };
1319		-/*----------------------------------------------------------------------------------
1320		-;lcd0 configuration
1321		-
1322		-;lcd_if: 0:hv(sync+de); 1:8080; 2:ttl; 3:lvds; 4:dsi; 5:edp; 6:extend dsi
1323		-;lcd_hv_if 0:Parallel RGB; 8:Serial RGB; 10:Dummy RGB; 11: RGB Dummy;12:CCIR656
1324		-;lcd_hv_clk_phase 0:0 degree;1:90 degree;2:180 degree;3:270 degree
1325		-;lcd_hv_sync_polarity 0:vs low,hs low; 1:vs high,hslow; 2:vs low,hs high; 3:vs high,hs high
1326		-;lcd_hv_syuv_seq 0:YUYV; 1:YVYU; 2:UYVY; 3:VYUY
1327		-;lcd_cpu_if 0:18bit/1 cycle parallel(RGB666); 4:16bit/1cycle parallel (RGB565)
1328		-; 6:18bit/3 cycle parallel(RGB666); 7:16bit/2cycle parallel (RGB565)
1329		-;lcd_cpu_te 0:frame auto trigger; 1:frame triggered by te rising edge; 2:frame triggered by te falling edge;
1330		-;lcd_dsi_if 0:video mode; 1: Command mode; 2:video burst mode
1331		-;lcd_dsi_te 0:frame auto trigger; 1:frame triggered by te rising edge; 2:frame triggered by te falling edge;
1332		-;lcd_x: lcd horizontal resolution
1333		-;lcd_y: lcd vertical resolution
1334		-;lcd_width: width of lcd in mm
1335		-;lcd_height: height of lcd in mm
1336		-;lcd_dclk_freq: in MHZ unit
1337		-;lcd_pwm_freq: in HZ unit
1338		-;lcd_pwm_pol: lcd backlight PWM polarity
1339		-;lcd_pwm_max_limit lcd backlight PWM max limit(<=255)
1340		-;lcd_hbp: hsync back porch(pixel) + hsync plus width(pixel);
1341		-;lcd_ht: hsync total cycle(pixel)
1342		-;lcd_vbp: vsync back porch(line) + vysnc plus width(line)
1343		-;lcd_vt: vysnc total cycle(line)
1344		-;lcd_hspw: hsync plus width(pixel)
1345		-;lcd_vspw: vysnc plus width(pixel)
1346		-;lcd_lvds_if: 0:single link; 1:dual link
1347		-;lcd_lvds_colordepth: 0:8bit; 1:6bit
1348		-;lcd_lvds_mode: 0:NS mode; 1:JEIDA mode
1349		-;lcd_frm: 0:disable; 1:enable rgb666 dither; 2:enable rgb656 dither
1350		-;lcd_io_phase: 0:noraml; 1:intert phase(0~3bit: vsync phase; 4~7bit:hsync phase;
1351		-; 8~11bit:dclk phase; 12~15bit:de phase)
1352		-;lcd_gamma_en lcd gamma correction enable
1353		-;lcd_bright_curve_en lcd bright curve correction enable
1354		-;lcd_cmap_en lcd color map function enable
1355		-;deu_mode 0:smoll lcd screen; 1:large lcd screen(larger than 10inch)
1356		-;lcdgamma4iep: Smart Backlight parameter, lcd gamma vale * 10;
1357		-; decrease it while lcd is not bright enough; increase while lcd is too bright
1358		-;smart_color 90:normal lcd screen 65:retina lcd screen(9.7inch)
1359		-;Pin setting for special function ie.LVDS, RGB data or vsync
1360		-; name(donot care) = port:PD12<pin function><pull up or pull down><drive ability><output level>
1361		-;Pin setting for gpio:
1362		-; lcd_gpio_X = port:PD12<pin function><pull up or pull down><drive ability><output level>
1363		-;Pin setting for backlight enable pin
1364		-; lcd_bl_en = port:PD12<pin function><pull up or pull down><drive ability><output level>
1365		-;fsync setting, pulse to csi
1366		-;lcd_fsync_en (0:disable fsync,1:enable)
1367		-;lcd_fsync_act_time (active time of fsync, unit:pixel)
1368		-;lcd_fsync_dis_time (disactive time of fsync, unit:pixel)
1369		-;lcd_fsync_pol (0:positive;1:negative)
1370		-;gpio config: <&pio for cpu or &r_pio for cpus, port, port num, pio function,
1371		-pull up or pull down(default 0), driver level(default 1), data>
1372		-;For dual link lvds: use lvds2link_pins_a and lvds2link_pins_b instead
1373		-;For rgb24: use rgb24_pins_a and rgb24_pins_b instead
1374		-;For lvds1: use lvds1_pins_a and lvds1_pins_b instead
1375		-;For lvds0: use lvds0_pins_a and lvds0_pins_b instead
1376		-;----------------------------------------------------------------------------------*/
1377		- lcd0: lcd0@01c0c000 {
1378		- lcd_used = <1>;
1379		-
1380		- lcd_driver_name = "default_lcd";
1381		- lcd_backlight = <100>;
1382		- lcd_if = <3>;
1383		-
1384		- lcd_x = <1024>;
1385		- lcd_y = <600>;
1386		- lcd_width = <217>;
1387		- lcd_height = <136>;
1388		- lcd_dclk_freq = <49>;
1389		-
1390		- lcd_pwm_used = <1>;
1391		- lcd_pwm_ch = <3>;
1392		- lcd_pwm_freq = <50000>;
1393		- lcd_pwm_pol = <1>;
1394		- lcd_pwm_max_limit = <255>;
1395		-
1396		- lcd_hbp = <124>;
1397		- lcd_ht = <1264>;
1398		- lcd_hspw = <24>;
1399		- lcd_vbp = <24>;
1400		- lcd_vt = <648>;
1401		- lcd_vspw = <4>;
1402		-
1403		- lcd_frm = <0>;
1404		- lcd_gamma_en = <0>;
1405		- lcd_bright_curve_en = <0>;
1406		- lcd_cmap_en = <0>;
1407		-
1408		- deu_mode = <0>;
1409		- lcdgamma4iep = <22>;
1410		- smart_color = <90>;
1411		-
1412		- lcd_lvds_if = <0>;
1413		- lcd_lvds_colordepth = <0>;
1414		- lcd_lvds_mode = <0>;
1415		-
1416		- lcd_pin_power = "dcdc1";
1417		- lcd_pin_power1 = "eldo3";
1418		-
1419		- lcd_power = "dc1sw";
1420		- lcd_gpio_0 = <&r_pio PL 11 1 0 3 1>;
1421		- pinctrl-0 = <&lvds0_pins_a>;
1422		- pinctrl-1 = <&lvds0_pins_b>;
1423		- };
1424		-
	1211	+/*
1425	1212	hall_para {
1426	1213	hall_name = "MH248";
1427	1214	status = "disabled";
1428	1215	hall_int_port = <&r_pio PL 9 6 1 0xffffffff 0xffffffff>;
1429	1216	};
1430		-
	1217	+*/
1431	1218	keyboard {
1432	1219	compatible = "allwinner,keyboard_1350mv";
1433	1220	status = "disable";
..	..	@@ -1437,6 +1224,39 @@
1437	1224	key2 = <900 0x72>;
1438	1225	};
1439	1226
	1227	+ wlan: wlan@0 {
	1228	+ compatible = "allwinner,sunxi-wlan";
	1229	+ clocks;
	1230	+ pinctrl-0;
	1231	+ pinctrl-names;
	1232	+ wlan_busnum = <0x1>;
	1233	+ wlan_power = "axp803-dldo1";
	1234	+ wlan_io_regulator;
	1235	+ wlan_regon = <&pio PG 10 1 0xffffffff 0xffffffff 1>;
	1236	+ wlan_hostwake = <&pio PG 13 6 0xffffffff 0xffffffff 0>;
	1237	+ //chip_en;
	1238	+ //power_en = <&pio PG 10 1 0xffffffff 0xffffffff 0>;
	1239	+ status = "okay";
	1240	+ };
	1241	+
	1242	+ bt: bt@0 {
	1243	+ compatible = "allwinner,sunxi-bt";
	1244	+ clocks = <&clk_losc_out>, <&clk_dcxo_out>;
	1245	+ bt_power = "axp803-dldo1";
	1246	+ bt_io_regulator;
	1247	+ bt_rst_n = <&r_pio PL 3 1 0xffffffff 0xffffffff 0>;
	1248	+ status = "okay";
	1249	+ };
	1250	+
	1251	+ btlpm: btlpm@0 {
	1252	+ compatible = "allwinner,sunxi-btlpm";
	1253	+ uart_index = <0x1>;
	1254	+ bt_wake = <&pio PG 12 1 0xffffffff 0xffffffff 1>;
	1255	+ bt_hostwake = <&pio PG 11 6 0xffffffff 0xffffffff 1>;
	1256	+ status = "okay";
	1257	+ };
	1258	+
	1259	+/*
1440	1260	wlan: wlan@0 {
1441	1261	compatible = "allwinner,sunxi-wlan";
1442	1262	clocks = <&clk_losc_out>, <&clk_dcxo_out>;
..	..	@@ -1445,30 +1265,31 @@
1445	1265	wlan_busnum = <0x1>;
1446	1266	wlan_power = "axp803-dldo1";
1447	1267	wlan_io_regulator;
1448		- wlan_regon = <&r_pio PL 5 1 0xffffffff 0xffffffff 0>;
1449		- wlan_hostwake = <&r_pio PL 6 6 0xffffffff 0xffffffff 0>;
	1268	+ wlan_regon = <&pio PG 10 1 0xffffffff 0xffffffff 0>;
	1269	+ wlan_hostwake = <&pio PG 13 6 0xffffffff 0xffffffff 0>;
1450	1270	chip_en;
1451	1271	power_en;
1452	1272	status = "okay";
1453	1273	};
	1274	+
1454	1275	bt: bt@0 {
1455	1276	compatible = "allwinner,sunxi-bt";
1456	1277	clocks = <&clk_losc_out>, <&clk_dcxo_out>;
1457	1278	bt_power = "axp803-dldo1";
1458	1279	//bt_power = "axp803-dldo1";
1459	1280	bt_io_regulator;
1460		- bt_rst_n = <&r_pio PL 2 1 0xffffffff 0xffffffff 0>;
	1281	+ //bt_rst_n = <&r_pio PL 2 1 0xffffffff 0xffffffff 0>;
1461	1282	status = "okay";
1462	1283	};
1463	1284
1464	1285	btlpm: btlpm@0 {
1465	1286	compatible = "allwinner,sunxi-btlpm";
1466	1287	uart_index = <0x1>;
1467		- bt_wake = <&r_pio PL 4 1 0xffffffff 0xffffffff 1>;
1468		- bt_hostwake = <&r_pio PL 3 6 0xffffffff 0xffffffff 1>;
	1288	+ bt_wake = <&pio PG 11 1 0xffffffff 0xffffffff 1>;
	1289	+ bt_hostwake = <&pio PG 12 6 0xffffffff 0xffffffff 1>;
1469	1290	status = "okay";
1470	1291	};
1471		-
	1292	+*/
1472	1293	addr_mgt: addr_mgt@0 {
1473	1294	compatible = "allwinner,sunxi-addr_mgt";
1474	1295	type_addr_wifi = <0x0>;
..	..	@@ -1516,69 +1337,24 @@
1516	1337	pinctrl-names = "default";
1517	1338	status = "okay";
1518	1339
1519		- sys {
	1340	+ sysled {
1520	1341	label = "sysled";
1521		- gpios = <&pio PH 19 1 0 1 0>;
	1342	+ gpios = <&r_pio PL 11 1 0 1 1>;
1522	1343	linux,default_trigger = "heartbeat";
1523	1344	};
1524		-
1525		- hubrst {
1526		- label = "hubrst";
1527		- gpios = <&pio PC 7 1 0 1 1>;
1528		- default_state="on";
1529		- };
1530		-
1531		- usb1_pwr {
1532		- label = "usb1_pwr";
1533		- gpios = <&r_pio PL 9 1 0 1 1>;
1534		- default_state="on";
1535		- };
1536	1345
1537		- usb2_pwr {
1538		- label = "usb2_pwr";
1539		- gpios = <&pio PH 15 1 0 1 1>;
1540		- default_state="on";
1541		- };
1542		-
1543		- usb3_pwr {
1544		- label = "usb3_pwr";
1545		- gpios = <&pio PH 16 1 0 1 1>;
1546		- default_state="on";
1547		- };
1548		-
1549		- usb4_pwr {
1550		- label = "usb4_pwr";
1551		- gpios = <&r_pio PL 8 1 0 1 1>;
1552		- default_state="on";
1553		- };
1554		-
1555		- usb5_pwr {
1556		- label = "usb5_pwr";
1557		- gpios = <&pio PH 18 1 0 1 1>;
1558		- default_state="on";
1559		- };
1560		-
1561		- usb6_pwr {
1562		- label = "usb6_pwr";
1563		- gpios = <&pio PB 6 1 0 1 1>;
1564		- default_state="on";
1565		- };
1566		-
1567		- usb7_pwr {
1568		- label = "usb7_pwr";
1569		- gpios = <&pio PB 8 1 0 1 1>;
1570		- default_state="on";
1571		- };
1572		-
1573		- spkmute {
1574		- label = "spkmute";
1575		- gpios = <&pio PH 13 1 0 1 0>;
1576		- default_state="on";
1577		- };
	1346	+ spk_en {
	1347	+ label = "spk_en";
	1348	+ gpios = <&pio PB 7 1 0 1 0>;
	1349	+ linux,default_trigger = "default-on";
	1350	+ };
1578	1351	};
1579		-
1580	1352	};
1581	1353
1582	1354	&cpu0 {
1583	1355	cpu-supply = <&reg_dcdc2>;
1584	1356	};
	1357	+
	1358	+//#include "lcd-lvds-21-1920-1080.dtsi"
	1359	+#include "lcd-lvds-7-1024-600.dtsi"
	1360	+//#include "lcd-mipi-10-800-1280.dtsi"