Source drop - G920TUVU2COF6

17/06/2015
AndreiLux · Jun 24, 2015 · 6c93da4 · 6c93da4
1 parent d7b1682
commit 6c93da4
Show file tree

Hide file tree

Showing 706 changed files with 322,154 additions and 77,712 deletions.
diff --git a/Makefile b/Makefile
@@ -340,7 +340,7 @@ DEPMOD		= /sbin/depmod
 PERL		= perl
 CHECK		= sparse
 
-ifeq ($(CONFIG_FIPS_FMP_UFS),)
+ifeq ($(CONFIG_FIPS_FMP),)
     READELF        = $(CROSS_COMPILE)readelf
     export READELF
 endif
@@ -695,6 +695,14 @@ KBUILD_CPPFLAGS += $(KCPPFLAGS)
 KBUILD_AFLAGS += $(KAFLAGS)
 KBUILD_CFLAGS += $(KCFLAGS)
 
+ifeq ($(CONFIG_SENSORS_FINGERPRINT), y)
+ifneq ($(CONFIG_SEC_FACTORY), true)
+ifneq ($(SEC_BUILD_CONF_USE_FINGERPRINT_TZ), false)
+    export KBUILD_FP_SENSOR_CFLAGS := -DENABLE_SENSORS_FPRINT_SECURE
+endif
+endif
+endif
+
 # Use --build-id when available.
 LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
 			      $(call cc-ldoption, -Wl$(comma)--build-id,))

diff --git a/arch/arm64/boot/dts/exynos7420-pinctrl.dtsi b/arch/arm64/boot/dts/exynos7420-pinctrl.dtsi
@@ -52,6 +52,27 @@
 			#interrupt-cells = <2>;
 		};
 
+		hrm_irq: hrm-irq {
+			samsung,pins = "gpa1-5";
+			samsung,pin-function = <0>;
+			samsung,pin-pud = <1>;
+			samsung,pin-drv = <3>;
+		};
+
+		hrm_irqsleep: hrm-irqsleep {
+			samsung,pins = "gpa1-5";
+			samsung,pin-function = <0xf>;
+			samsung,pin-pud = <1>;
+			samsung,pin-drv = <3>;
+		};
+
+		hrm_irqidle: hrm-irqidle {
+			samsung,pins = "gpa1-5";
+			samsung,pin-function = <0xf>;
+			samsung,pin-pud = <1>;
+			samsung,pin-drv = <3>;
+		};
+
 		bt_hostwake: bt-hostwake {
 			samsung,pins = "gpa2-1";
 			samsung,pin-function = <0>;
@@ -94,6 +115,13 @@
 			samsung,pin-function = <0>;
 			samsung,pin-pud = <0>;
 		};
+
+		grip_irq: grip-irq {
+			samsung,pins = "gpa3-4";
+			samsung,pin-function = <0xf>;
+			samsung,pin-pud = <0>;
+			samsung,pin-drv = <3>;
+		};
 	};
 
 	pinctrl@114B0000 {
@@ -1190,6 +1218,20 @@
 			samsung,pin-con-pdn = <3>;
 			samsung,pin-pud-pdn = <0>;
 		};
+
+		grip_i2c: grip-i2c {
+			samsung,pins = "gpr1-3", "gpr1-4";
+			samsung,pin-function = <0x0>;
+			samsung,pin-pud = <0>;
+			samsung,pin-drv = <3>;
+		};
+
+		grip_ldo: grip-ldo {
+			samsung,pins = "gpr1-5";
+			samsung,pin-function = <0xf>;
+			samsung,pin-pud = <0>;
+			samsung,pin-drv = <3>;
+		};
 	};
 
 };

diff --git a/arch/arm64/boot/dts/exynos7420-zero_common.dtsi b/arch/arm64/boot/dts/exynos7420-zero_common.dtsi
@@ -403,9 +403,9 @@
 
 		normal_powermode_current_rd = <10>;
 		low_powermode_current_rd = <2>;
-		br_ratio_r_rd = <90>;
+		br_ratio_r_rd = <180>;
 		br_ratio_g_rd = <30>;
-		br_ratio_b_rd = <50>;
+		br_ratio_b_rd = <30>;
 	};
 
 	hsi2c@13660000 {
@@ -508,6 +508,10 @@
 			reg = <0x51>;
 			interrupt-parent = <&gpa1>;
 			interrupts = <5 0 0>;
+			pinctrl-names = "default", "sleep", "idle";
+			pinctrl-0 = <&hrm_irq>;
+			pinctrl-1 = <&hrm_irqsleep>;
+			pinctrl-2 = <&hrm_irqidle>;
 			max86900,hrm_int-gpio = <&gpa1 5 0>;
 			max86900,vdd_1p8 = "HRM_VDD_1.8V";
 			max86900,led_3p3 = "V_HRM_3.3V";
@@ -849,7 +853,7 @@
 	ipa_pdata {
 		compatible = "samsung,exynos-ipa";
 
-		control_temp = <90>;
+		control_temp = <45>;
 		temp_threshold = <10>;
 		enabled = <1>;
 		tdp = <3500>;
@@ -1206,25 +1210,34 @@
 		ois@24{
 			compatible = "rumba,ois";
 			reg = <0x24>;
+			use_i2c_pinctrl;
 			fimc_is_ois_pinname = "13470000.pinctrl";
 			fimc_is_ois_sda = "gpc2-4";
 			fimc_is_ois_scl = "gpc2-5";
+			pinfunc_on = <0>;
+			pinfunc_off = <2>;
 		};
 
 		af@0c{
 			compatible = "samsung,af";
 			reg = <0x0c>;
+			use_i2c_pinctrl;
 			fimc_is_af_pinname = "13470000.pinctrl";
 			fimc_is_af_sda = "gpc2-4";
 			fimc_is_af_scl = "gpc2-5";
+			pinfunc_on = <0>;
+			pinfunc_off = <2>;
 		};
 
 		front_eeprom@51 {
 			compatible = "samsung,front-eeprom-i2c";
 			reg = <0x51>;
+			use_i2c_pinctrl;
 			fimc_is_front_eeprom_pinname = "13470000.pinctrl";
 			fimc_is_front_eeprom_sda = "gpb2-4";
 			fimc_is_front_eeprom_scl = "gpb2-5";
+			pinfunc_on = <0>;
+			pinfunc_off = <2>;
 		};
 	};
 
@@ -1324,6 +1337,26 @@
 		pinctrl-0 = <&fimc_is_flash_is &fimc_is_mclk0_out &fimc_is_mclk1_out &fimc_is_mclk2_out>;
 		pinctrl-1 = <>;
 
+		total_camera_num = <2>;
+		camera_info0 {				// 0 : rear
+			isp = <0>;			/* 0 : INT , 1 : EXT , 2 : SOC */
+			cal_memory = <1>;		/* 0 : N , 1 : FROM , 2 : EEPROM , 3 : OTP  */
+			read_version = <0>;		/* 0 : SYSFS , 1 : CAMON */
+			core_voltage = <1>;		/* 0 : N , 1 : Y  */
+			upgrade = <1>;			/* 0 : N , 1 : SYSFS , 2 : CAMON */
+			companion = <1>;		/* 0 : N , 1 : Y  */
+			ois = <1>;			/* 0 : N , 1 : Y  */
+		};
+		camera_info1 {				// 1 : front
+			isp = <0>;			/* 0 : INT , 1 : EXT , 2 : SOC */
+			cal_memory = <2>;		/* 0 : N , 1 : FROM , 2 : EEPROM , 3 : OTP  */
+			read_version = <0>;		/* 0 : SYSFS , 1 : CAMON */
+			core_voltage = <0>;		/* 0 : N , 1 : Y  */
+			upgrade = <0>;			/* 0 : N , 1 : SYSFS , 2 : CAMON */
+			companion = <1>;		/* 0 : N , 1 : Y  */
+			ois = <0>;			/* 0 : N , 1 : Y  */
+		};
+
 		#define DVFS_INT_L0 560000
 		#define DVFS_INT_L1 550000
 		#define DVFS_INT_L2 540000
@@ -1993,10 +2026,9 @@
 		boot_device@3 {
 			net_boost,label="P2P";
 			net_boost,node="p2p-wlan0-0";
-			net_boost,table_size = <3>;
+			net_boost,table_size = <2>;
 			net_boost,table= <
-				30 1000000 0 800000 0 0 200000 0 0 0
-				50 1200000 0 1000000 0 0 200000 0 0 0
+				30 1200000 0 1200000 0 0 200000 0 0 0
 				90 1700000 0 1200000 0 543000 267000 0 0 1
 				>;
 		};
@@ -2005,8 +2037,8 @@
 			net_boost,node="wlan0";
 			net_boost,table_size = <3>;
 			net_boost,table= <
-				60 1000000 0 800000 0 0 200000 0 0 0
-				100 1200000 0 1000000 0 0 200000 0 0 0
+				20 1000000 0 800000 0 0 200000 0 0 0
+				60 1500000 0 1200000 0 0 200000 0 0 0
 				180 1896000 0 1500000 0 543000 267000 1 1 1
 				>;
 		};

diff --git a/arch/arm64/boot/dts/exynos7420-zeroflte_battery.dtsi b/arch/arm64/boot/dts/exynos7420-zeroflte_battery.dtsi
@@ -73,7 +73,7 @@
 		battery,temp_adc_type = <1>; /* SEC_BATTERY_ADC_TYPE_AP */
 
 		battery,chg_temp_check = <1>;
-		/*battery,wpc_temp_check = <1>;*/
+		battery,wpc_temp_check = <1>;
 
 		battery,polling_time = <10 30 30 30 3600>;
 
@@ -87,7 +87,7 @@
 		battery,chg_temp_table_data = <700 650 630 600 580 550 500 450 430 400 350
 					    300 250 200 150 100 50 0 (-30) (-50) (-100) (-150) (-200)>;
 
-		battery,input_current_limit = <1800 0 0 1800 460 900 1000 460 1000 0 820 1900 1800 0 0 400 700 1300 300 1000 1500 0 1667 1000 1667 80 1800 1667 1400 1500 1500>;
+		battery,input_current_limit = <1800 0 0 1800 460 900 1000 460 1000 0 820 1900 1800 0 0 400 700 1300 300 1000 1500 0 1667 1000 1667 80 1800 1667 1400 1000 1000>;
 		battery,fast_charging_current = <2100 0 0 2100 460 1200 1000 460 1200 0 1200 1600 2100 0 0 400 700 1300 300 1000 1500 0 2550 1000 2550 80 1800 1000 1400 0 1000>;
 		battery,full_check_current_1st = <275 0 0 275 275 275 275 275 275 0 275 275 275 0 0 275 275 275 275 275 275 0 275 275 275 0 275 275 275 0 275>;
 		battery,full_check_current_2nd = <125 0 0 125 125 125 125 125 125 0 125 125 125 0 0 125 125 125 125 125 125 0 125 125 125 0 125 125 125 0 125>;
@@ -143,9 +143,9 @@
 		battery,chg_skip_capacity = <10>;
 		battery,chg_skip_time = <600>;
 
-		battery,wpc_high_temp = <390>;
-		battery,wpc_high_temp_recovery = <200>;
-		battery,wpc_charging_limit_current = <700>;
+		battery,wpc_high_temp = <400>;
+		battery,wpc_high_temp_recovery = <390>;
+		battery,wpc_charging_limit_current = <450>;
 
 		/* SEC_BATTERY_FULL_CONDITION_SOC |
 		   SEC_BATTERY_FULL_CONDITION_NOTIMEFULL |

diff --git a/arch/arm64/boot/dts/exynos7420-zeroflte_battery_06.dtsi b/arch/arm64/boot/dts/exynos7420-zeroflte_battery_06.dtsi
@@ -73,7 +73,7 @@
 		battery,temp_adc_type = <1>; /* SEC_BATTERY_ADC_TYPE_AP */
 
 		battery,chg_temp_check = <1>;
-		/*battery,wpc_temp_check = <1>;*/
+		battery,wpc_temp_check = <1>;
 
 		battery,polling_time = <10 30 30 30 3600>;
 
@@ -95,10 +95,10 @@
 		battery,wireless_cc_cv = <86>;
 		battery,inbat_voltage = <1>;
 
-		battery,inbat_voltage_table_adc = <2905 2873 2848 2819 2787 2762 2731 2677 2655 2619
-						2591 2565 2534 2504 2475 2445 2420 2401 2364 2343>;
-		battery,inbat_voltage_table_data = <438 435 430 425 420 415 410 400 395 390
-						 385 380 375 370 365 360 355 350 345 340>;
+		battery,inbat_voltage_table_adc = <3120 3101 3061 3038 3001 2956 2920 2887 2856 2814
+						2793 2754 2720 2677 2641 2613 2572 2531 2502 2467 2436>;
+		battery,inbat_voltage_table_data = <438 435 430 425 420 415 410 405 400 395
+						390 385 380 375 370 365 360 355 350 345 340>;
 
 		battery,adc_check_count = <5>;
 
@@ -151,9 +151,9 @@
 		battery,chg_skip_check_capacity = <10>;
 		battery,chg_skip_check_time = <600>;
 
-		battery,wpc_high_temp = <390>;
-		battery,wpc_high_temp_recovery = <200>;
-		battery,wpc_charging_limit_current = <700>;
+		battery,wpc_high_temp = <420>;
+		battery,wpc_high_temp_recovery = <410>;
+		battery,wpc_charging_limit_current = <450>;
 
 		/* SEC_BATTERY_FULL_CONDITION_SOC |
 		   SEC_BATTERY_FULL_CONDITION_NOTIMEFULL |
@@ -165,13 +165,13 @@
 		battery,recharge_check_count = <2>;
 		battery,recharge_condition_type = <4>; /* SEC_BATTERY_RECHARGE_CONDITION_VCELL */
 		battery,recharge_condition_soc = <98>;
-		battery,recharge_condition_vcell = <4350>;
+		battery,recharge_condition_vcell = <4325>;
 
 		battery,charging_total_time = <21600>;
 		battery,recharging_total_time = <5400>;
 		battery,charging_reset_time = <0>;
 
-		battery,chg_float_voltage = <4375>;
+		battery,chg_float_voltage = <4350>;
 
 		battery,self_discharging_en;
 		battery,force_discharging_limit = <650>;
@@ -345,7 +345,7 @@
 		battery,chg_polarity_en = <0>;
 		battery,chg_gpio_status = <0>;
 		battery,chg_polarity_status = <0>;
-		battery,chg_float_voltage = <4375>;
+		battery,chg_float_voltage = <4350>;
 	};
 
 };
diff --git a/arch/arm64/boot/dts/exynos7420-zeroflte_svcled.dtsi b/arch/arm64/boot/dts/exynos7420-zeroflte_svcled.dtsi
@@ -44,8 +44,8 @@
 
 		normal_powermode_current_rd = <10>;
 		low_powermode_current_rd = <2>;
-		br_ratio_r_bl = <450>;
-		br_ratio_g_bl = <230>;
-		br_ratio_b_bl = <830>;
+		br_ratio_r_rd = <450>;
+		br_ratio_g_rd = <230>;
+		br_ratio_b_rd = <830>;
 	};
 };
diff --git a/arch/arm64/boot/dts/exynos7420-zeroflte_usa_05.dts b/arch/arm64/boot/dts/exynos7420-zeroflte_usa_05.dts
@@ -350,9 +350,8 @@
 	audio_pdata {
 		compatible = "samsung,audio-pdata";
 
-		aif_format = <0x00 0x13 0x00>;
-		/* I2S: 0x00, TDM: 0x10 */
-		/* I2S: 0x0, Right-J: 0x1 Left-J: 0x2, DSP A: 0x3, DSP B: 0x4, */
+		aif_format = <0x1001 0x1004 0x1001>;
+		aif_format_tdm = <0x0 0x1047 0x0>;
 
 		imp_table = <
 			/* min      max gain */

diff --git a/arch/arm64/boot/dts/exynos7420-zeroflte_usa_battery.dtsi b/arch/arm64/boot/dts/exynos7420-zeroflte_usa_battery.dtsi
@@ -73,7 +73,7 @@
 		battery,temp_adc_type = <1>; /* SEC_BATTERY_ADC_TYPE_AP */
 
 		battery,chg_temp_check = <1>;
-		/*battery,wpc_temp_check = <1>;*/
+		battery,wpc_temp_check = <1>;
 
 		battery,polling_time = <10 30 30 30 3600>;
 
@@ -87,7 +87,7 @@
 		battery,chg_temp_table_data = <700 650 630 600 580 550 500 450 430 400 350
 					    300 250 200 150 100 50 0 (-30) (-50) (-100) (-150) (-200)>;
 
-		battery,input_current_limit = <1800 0 0 1800 460 900 1000 460 1000 0 820 1900 1800 0 0 400 700 1300 300 1000 1500 0 1667 1000 1667 80 1800 1667 1400 1500 1500>;
+		battery,input_current_limit = <1800 0 0 1800 460 900 1000 460 1000 0 820 1900 1800 0 0 400 700 1300 300 1000 1500 0 1667 1000 1667 80 1800 1667 1400 1000 1000>;
 		battery,fast_charging_current = <2100 0 0 2100 460 1200 1000 460 1200 0 1200 1600 2100 0 0 400 700 1300 300 1000 1500 0 2550 1000 2550 80 1800 1000 1400 0 1000>;
 		battery,full_check_current_1st = <275 0 0 275 275 275 275 275 275 0 275 275 275 0 0 275 275 275 275 275 275 0 275 275 275 0 275 275 275 0 275>;
 		battery,full_check_current_2nd = <125 0 0 125 125 125 125 125 125 0 125 125 125 0 0 125 125 125 125 125 125 0 125 125 125 0 125 125 125 0 125>;
@@ -143,9 +143,9 @@
 		battery,chg_skip_check_capacity = <10>;
 		battery,chg_skip_check_time = <600>;
 
-		battery,wpc_high_temp = <390>;
-		battery,wpc_high_temp_recovery = <200>;
-		battery,wpc_charging_limit_current = <700>;
+		battery,wpc_high_temp = <420>;
+		battery,wpc_high_temp_recovery = <410>;
+		battery,wpc_charging_limit_current = <450>;
 
 		/* SEC_BATTERY_FULL_CONDITION_SOC |
 		   SEC_BATTERY_FULL_CONDITION_NOTIMEFULL |