~lzh/A133.git

..	..	@@ -17,15 +17,15 @@
17	17	standby_param = &standby_param;
18	18	};
19	19
20		- reg_usb1_vbus: usb1-vbus {
	20	+ reg_usb1_vbus: usb1-vbus {
21	21	compatible = "regulator-fixed";
22		- gpio = <&r_pio PL 8 1 2 0 1>;
	22	+ //gpio = <&r_pio PL 8 1 2 0 1>;
23	23	regulator-name = "usb1-vbus";
24	24	regulator-min-microvolt = <5000000>;
25	25	regulator-max-microvolt = <5000000>;
26	26	regulator-enable-ramp-delay = <1000>;
27	27	enable-active-high;
28		- };
	28	+ };
29	29
30	30	soc: soc@03000000 {
31	31
..	..	@@ -288,25 +288,6 @@
288	288	pinctrl-0 = <&twi0_pins_a>;
289	289	pinctrl-1 = <&twi0_pins_b>;
290	290	status = "okay";
291		- ctp {
292		- compatible = "gt9xx_ts";
293		- ctp_used = <1>;
294		- device_type = "ctp";
295		- status = "okay";
296		- ctp_twi_id = <0x0>;
297		- ctp_name = "gt9xx";
298		- reg = <0x5D>;
299		- ctp_screen_max_x = <1024>;
300		- ctp_screen_max_y = <600>;
301		- ctp_revert_x_flag = <0x1>;
302		- ctp_revert_y_flag = <0x1>;
303		- ctp_exchange_x_y_flag = <0x0>;
304		- ctp_int_port = <&pio PE 3 6 0xffffffff 0xffffffff 0>;
305		- ctp_wakeup = <&pio PE 4 1 0xffffffff 0xffffffff 1>;
306		- ctp_power_ldo = <3300>;
307		- ctp_power_ldo_vol = <3300>;
308		- ctp_power = <3300>;
309		- };
310	291	};
311	292
312	293	spi0: spi@05010000 {
..	..	@@ -428,10 +409,10 @@
428	409	compatible = "x-powers,axp803-usb-power-supply";
429	410	status = "okay";
430	411
431		- pmu_usbpc_vol = <5000>;
432		- pmu_usbpc_cur = <5000>;
433		- pmu_usbad_vol = <5000>;
434		- pmu_usbad_cur = <5000>;
	412	+ pmu_usbpc_vol = <4600>;
	413	+ pmu_usbpc_cur = <3000>;
	414	+ pmu_usbad_vol = <4600>;
	415	+ pmu_usbad_cur = <3000>;
435	416
436	417	wakeup_usb_in;
437	418	wakeup_usb_out;
..	..	@@ -442,21 +423,21 @@
442	423	status = "okay";
443	424
444	425	pmu_chg_ic_temp = <0>;
445		- pmu_battery_rdc= <93>;
446		- pmu_battery_cap = <5067>;
447		- pmu_runtime_chgcur = <1000>;
448		- pmu_suspend_chgcur = <2000>;
449		- pmu_shutdown_chgcur = <2000>;
450		- pmu_init_chgvol = <4200>;
	426	+ pmu_battery_rdc= <50>;
	427	+ pmu_battery_cap = <8000>;
	428	+ pmu_runtime_chgcur = <2800>;
	429	+ pmu_suspend_chgcur = <2800>;
	430	+ pmu_shutdown_chgcur = <2800>;
	431	+ pmu_init_chgvol = <4280>;
451	432	pmu_battery_warning_level1 = <15>;
452	433	pmu_battery_warning_level2 = <0>;
453		- pmu_chgled_func = <0>;
	434	+ pmu_chgled_func = <1>;
454	435	pmu_chgled_type = <0>;
455	436	ocv_coulumb_100 = <1>;
456	437	pmu_bat_para1 = <0>;
457		- pmu_bat_para2 = <0>;
458		- pmu_bat_para3 = <0>;
459		- pmu_bat_para4 = <0>;
	438	+ pmu_bat_para2 = <3>;
	439	+ pmu_bat_para3 = <4>;
	440	+ pmu_bat_para4 = <5>;
460	441	pmu_bat_para5 = <6>;
461	442	pmu_bat_para6 = <8>;
462	443	pmu_bat_para7 = <9>;
..	..	@@ -474,16 +455,16 @@
474	455	pmu_bat_para19 = <65>;
475	456	pmu_bat_para20 = <70>;
476	457	pmu_bat_para21 = <75>;
477		- pmu_bat_para22 = <80>;
478		- pmu_bat_para23 = <83>;
479		- pmu_bat_para24 = <84>;
480		- pmu_bat_para25 = <86>;
481		- pmu_bat_para26 = <90>;
482		- pmu_bat_para27 = <94>;
483		- pmu_bat_para28 = <97>;
484		- pmu_bat_para29 = <99>;
485		- pmu_bat_para30 = <100>;
486		- pmu_bat_para31 = <100>;
	458	+ pmu_bat_para22 = <76>;
	459	+ pmu_bat_para23 = <77>;
	460	+ pmu_bat_para24 = <78>;
	461	+ pmu_bat_para25 = <79>;
	462	+ pmu_bat_para26 = <80>;
	463	+ pmu_bat_para27 = <83>;
	464	+ pmu_bat_para28 = <85>;
	465	+ pmu_bat_para29 = <88>;
	466	+ pmu_bat_para30 = <90>;
	467	+ pmu_bat_para31 = <95>;
487	468	pmu_bat_para32 = <100>;
488	469
489	470	pmu_bat_temp_enable = <0>;
..	..	@@ -509,7 +490,7 @@
509	490	pmu_bat_temp_para16 = <66>;
510	491
511	492	wakeup_bat_out;
512		- /* wakeup_bat_in; */
	493	+ wakeup_bat_in;
513	494	/* wakeup_bat_charging; */
514	495	/* wakeup_bat_charge_over; */
515	496	/* wakeup_low_warning1; */
..	..	@@ -523,7 +504,7 @@
523	504	powerkey0: powerkey@0 {
524	505	status = "okay";
525	506	compatible = "x-powers,axp2101-pek";
526		- pmu_powkey_off_time = <6000>;
	507	+ pmu_powkey_off_time = <8000>;
527	508	pmu_powkey_off_func = <0>;
528	509	pmu_powkey_off_en = <1>;
529	510	pmu_powkey_long_time = <1500>;
..	..	@@ -943,13 +924,13 @@
943	924	status = "okay";
944	925	};
945	926
946		- ehci1:ehci1-controller@0x05200000 {
	927	+ ehci1:ehci1-controller@0x05200000 {
947	928	drvvbus-supply = <&reg_usb1_vbus>;
948	929	};
949	930
950	931	ohci1:ohci1-controller@0x05200400 {
951	932	drvvbus-supply = <&reg_usb1_vbus>;
952		- };
	933	+ };
953	934
954	935	sdc1: sdmmc@04021000 {
955	936	bus-width = <4>;
..	..	@@ -960,7 +941,7 @@
960	941	/sd-uhs-sdr25/
961	942	sd-uhs-sdr50;
962	943	sd-uhs-ddr50;
963		- sd-uhs-sdr104;
	944	+ //sd-uhs-sdr104;
964	945	// kickpi
965	946	//sunxi-power-save-mode;
966	947	/sunxi-dis-signal-vol-sw;/
..	..	@@ -991,9 +972,9 @@
991	972	lineout_vol = <0x1a>;
992	973	headphonegain = <0x00>;
993	974	/* Pa enabled about */
994		- pa_level = <0x00>;
	975	+ pa_level = <0x01>;
995	976	pa_msleep_time = <0x78>;
996		- //gpio-spk = <&pio PB 7 1 1 1 1>;
	977	+ gpio-spk = <&pio PB 7 1 1 1 1>;
997	978	/* regulator about */
998	979	avcc-supply = <&reg_aldo1>;
999	980	cpvin-supply = <&reg_eldo1>;
..	..	@@ -1334,6 +1315,10 @@
1334	1315	uart4: uart@05001000 {
1335	1316	status = "okay";
1336	1317	};
	1318	+
	1319	+ uart7: uart@07080000 {
	1320	+ status = "okay";
	1321	+ };
1337	1322	};
1338	1323	gpu: gpu@0x01800000 {
1339	1324	gpu_idle = <1>;/ic version ctrl/
..	..	@@ -1355,17 +1340,23 @@
1355	1340	pinctrl-names = "default";
1356	1341	status = "okay";
1357	1342
1358		- sysled {
1359		- label = "sysled";
1360		- gpios = <&r_pio PL 10 1 0 1 1>;
	1343	+ usb_vbus {
	1344	+ abel = "usb_vbus";
	1345	+ gpios = <&r_pio PL 8 1 2 0 1>;
	1346	+ linux,default_trigger = "default-on";
	1347	+ };
	1348	+
	1349	+ work-led {
	1350	+ label = "work-led";
	1351	+ gpios = <&r_pio PL 10 1 0 1 0>;
1361	1352	linux,default_trigger = "heartbeat";
1362	1353	};
1363	1354
1364		- spk_en {
1365		- label = "spk_en";
1366		- gpios = <&pio PB 7 1 0 1 0>;
1367		- linux,default_trigger = "default-on";
1368		- };
	1355	+ // spk_en {
	1356	+ // label = "spk_en";
	1357	+ // gpios = <&pio PB 7 1 0 1 0>;
	1358	+ // linux,default_trigger = "default-on";
	1359	+ // };
1369	1360
1370	1361	fan_en {
1371	1362	label = "fan_en";
..	..	@@ -1409,17 +1400,17 @@
1409	1400	linux,default_trigger = "default-on";
1410	1401	};
1411	1402
1412		- PL2 {
1413		- label = "PL2";
1414		- gpios = <&r_pio PL 2 1 0 1 0>;
1415		- linux,default_trigger = "default-on";
1416		- };
	1403	+ // PL2 {
	1404	+ // label = "PL2";
	1405	+ // gpios = <&r_pio PL 2 1 0 1 0>;
	1406	+ // linux,default_trigger = "default-on";
	1407	+ // };
1417	1408
1418		- PL3 {
1419		- label = "PL3";
1420		- gpios = <&r_pio PL 3 1 0 1 0>;
1421		- linux,default_trigger = "default-on";
1422		- };
	1409	+ // PL3 {
	1410	+ // label = "PL3";
	1411	+ // gpios = <&r_pio PL 3 1 0 1 0>;
	1412	+ // linux,default_trigger = "default-on";
	1413	+ // };
1423	1414
1424	1415	PL4 {
1425	1416	label = "PL4";
..	..	@@ -1463,8 +1454,13 @@
1463	1454	rx-delay = <7>;
1464	1455	};
1465	1456
1466		-
	1457	+//#include "lcd-lvds-7-1024-600.dtsi"
1467	1458	//#include "lcd-lvds-21-1920-1080.dtsi"
1468		-#include "lcd-lvds-7-1024-600.dtsi"
1469		-//#include "lcd-mipi-10-800-1280.dtsi"
	1459	+//#include "lcd-mipi-10-800-1280-v1.dtsi"
	1460	+//#include "lcd-mipi-10-800-1280-v2.dtsi"
1470	1461	//#include "lcd-mipi-8-800-1280.dtsi"
	1462	+#include "lcd-mipi-5-720-1280.dtsi"
	1463	+
	1464	+//#include "a133-kickpi-axp707-bat-5000mA.dtsi"
	1465	+#include "a133-kickpi-axp707-bat-8000mA.dtsi"
	1466	+