[Part 2/2] Update & cleanning source... Fully Rebase on los

negrroo · May 1, 2020 · 6450ca7 · 6450ca7
1 parent e71548d
commit 6450ca7
Show file tree

Hide file tree

Showing 816 changed files with 560,305 additions and 41,131 deletions.
diff --git a/Makefile b/Makefile
@@ -525,40 +525,13 @@ endif
 ifneq ($(GCC_TOOLCHAIN),)
 CLANG_FLAGS	+= --gcc-toolchain=$(GCC_TOOLCHAIN)
 endif
-KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
-KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)
-KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
-KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
-KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
-KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)
-KBUILD_CFLAGS += -Wno-undefined-optimized
-KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare
-KBUILD_CFLAGS += $(call cc-option, -Wno-sometimes-uninitialized)
-KBUILD_CFLAGS += -Wno-asm-operand-widths
-KBUILD_CFLAGS += -Wno-initializer-overrides
-KBUILD_CFLAGS += -fno-builtin
-
-# Quiet clang warning: comparison of unsigned expression < 0 is always false
-
-KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
-# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
-# source of a reference will be _MergedGlobals and not on of the whitelisted names.
-# See modpost pattern 2
-KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
-KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
 CLANG_FLAGS	+= -no-integrated-as
 CLANG_FLAGS	+= -Werror=unknown-warning-option
 KBUILD_CFLAGS	+= $(CLANG_FLAGS)
 KBUILD_AFLAGS	+= $(CLANG_FLAGS)
-else
-
-KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
-# These warnings generated too much noise in a regular build.
-# Use make W=1 to enable them (see scripts/Makefile.build)
-KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
-KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
 endif
 
+
 ifeq ($(mixed-targets),1)
 # ===========================================================================
 # We're called with mixed targets (*config and build targets).
@@ -704,7 +677,6 @@ KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)
 KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)
 KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)
 KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)
-KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)
 
 ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
 KBUILD_CFLAGS	+= $(call cc-option,-ffunction-sections,)

diff --git a/arch/arm/boot/dts/qcom/sdxpoorwills.dtsi b/arch/arm/boot/dts/qcom/sdxpoorwills.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -641,10 +641,8 @@
 	restart_pshold: restart@c264000 {
 		compatible = "qcom,pshold";
 		reg = <0x0c264000 0x4>,
-			<0x01fd3000 0x4>,
-			<0x00786070 0x4>;
-		reg-names = "pshold-base", "tcsr-boot-misc-detect",
-				"boot-config";
+			<0x01fd3000 0x4>;
+		reg-names = "pshold-base", "tcsr-boot-misc-detect";
 	};
 
 	tsens0: tsens@c222000 {

diff --git a/arch/arm/configs/ranchu_defconfig b/arch/arm/configs/ranchu_defconfig
@@ -106,7 +106,6 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y
 CONFIG_NETFILTER_XT_MATCH_OWNER=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
 CONFIG_NETFILTER_XT_MATCH_SOCKET=y

diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
@@ -113,7 +113,6 @@ static inline u32 arch_timer_get_cntkctl(void)
 static inline void arch_timer_set_cntkctl(u32 cntkctl)
 {
 	asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
-	isb();
 }
 
 #endif

diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
@@ -20,7 +20,6 @@
 #include <linux/nodemask.h>
 #include <linux/of.h>
 #include <linux/sched.h>
-#include <linux/sched/topology.h>
 #include <linux/slab.h>
 #include <linux/sched_energy.h>
 

diff --git a/arch/arm64/boot/dts/qcom/batterydata-d5-atl-3400mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-d5-atl-3400mAh.dtsi
@@ -2,85 +2,80 @@
 qcom,d5_atl_3400mah {
 	/* #2957455_Xiaomi_D5scud_3400mAh_averaged_MasterSlave_Jun6th2017*/
 	qcom,max-voltage-uv = <4400000>;
-	qcom,fastchg-current-ma = <3300>;
+        qcom,fastchg-current-ma = <3300>;
 	qcom,nom-batt-capacity-mah = <3400>;
 	qcom,fg-cc-cv-threshold-mv = <4390>;
 	qcom,batt-id-kohm = <68>;
 	qcom,battery-beta = <3380>;
 	qcom,battery-type = "d5_atl";
-	qcom,jeita-fcc-ranges = <0   50   330000
-			51  100  990000
-			101  150  990000
-			151 450  3300000
-			451 600  1650000>;
-	qcom,jeita-fv-ranges =  <0   50   4400000
-			51  100  4400000
-			101  150  4400000
-			151 450  4400000
-			451 600  4100000>;
-	qcom,dynamic-fv-ranges = <0    100  4400000
-			101  200  4380000
-			201  300  4360000
-			301  400  4340000
-			401  500  4340000>;
+        qcom,jeita-fcc-ranges = <0   50   330000
+				51  100  990000
+                                 101  150  990000
+                                 151 450  3300000
+                                 451 600  1650000>;
+        qcom,jeita-fv-ranges =  <0   50   4400000
+                                 51  100  4400000
+				101  150  4400000
+                                 151 450  4400000
+                                 451 600  4100000>;
 	qcom,checksum = <0x8E3D>;
 	qcom,gui-version = "PMI8998GUI - 2.0.0.58";
 	qcom,fg-profile-data = [
-			0A 1F 3A 06
-			00 0A C7 06
-			D4 1C 0C 02
-			98 0D C7 0A
-			95 17 D6 23
-			7F 44 31 5A
-			6F 00 00 00
-			11 00 00 00
-			00 00 D8 BB
-			61 CD DF A2
-			26 00 08 00
-			AB EA 51 EC
-			D1 FC BB F3
-			58 0C F3 FA
-			62 06 BB 32
-			1F 06 09 20
-			27 00 14 00
-			18 20 25 05
-			D4 0A F4 05
-			C8 1C ED 02
-			1A 0C 19 12
-			91 18 AC 23
-			20 44 D6 5A
-			6E 00 00 00
-			0E 00 00 00
-			00 00 86 D5
-			3E CA 24 CA
-			1E 00 00 00
-			5B F2 51 EC
-			7B F4 22 EB
-			7A 07 87 FB
-			69 BA BC 1B
-			AB 33 CC FF
-			07 10 00 00
-			3E 0D 66 46
-			1E 00 40 00
-			66 01 0A FA
-			FF 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
+		 0A 1F 3A 06
+		 00 0A C7 06
+		 D4 1C 0C 02
+		 98 0D C7 0A
+		 95 17 D6 23
+		 7F 44 31 5A
+		 6F 00 00 00
+		 11 00 00 00
+		 00 00 D8 BB
+		 61 CD DF A2
+		 26 00 08 00
+		 AB EA 51 EC
+		 D1 FC BB F3
+		 58 0C F3 FA
+		 62 06 BB 32
+		 1F 06 09 20
+		 27 00 14 00
+		 18 20 25 05
+		 D4 0A F4 05
+		 C8 1C ED 02
+		 1A 0C 19 12
+		 91 18 AC 23
+		 20 44 D6 5A
+		 6E 00 00 00
+		 0E 00 00 00
+		 00 00 86 D5
+		 3E CA 24 CA
+		 1E 00 00 00
+		 5B F2 51 EC
+		 7B F4 22 EB
+		 7A 07 87 FB
+		 69 BA BC 1B
+		 AB 33 CC FF
+		 07 10 00 00
+		 3E 0D 66 46
+		 1E 00 40 00
+		 66 01 0A FA
+		 FF 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
 	];
 };
diff --git a/arch/arm64/boot/dts/qcom/batterydata-d5-cos-3400mAh.dtsi b/arch/arm64/boot/dts/qcom/batterydata-d5-cos-3400mAh.dtsi
@@ -1,85 +1,81 @@
 
 qcom,d5_cos_3400mah {
+	/* #2957479_Xiaomi_D5cos_3400mAh_averaged_MasterSlave_Jun6th2017*/
 	qcom,max-voltage-uv = <4400000>;
-	qcom,fastchg-current-ma = <3300>;
+        qcom,fastchg-current-ma = <3300>;
 	qcom,nom-batt-capacity-mah = <3400>;
 	qcom,fg-cc-cv-threshold-mv = <4390>;
 	qcom,batt-id-kohm = <100>;
 	qcom,battery-beta = <3380>;
 	qcom,battery-type = "d5_cos";
-	qcom,jeita-fcc-ranges = <0   50   330000
-			51  100  990000
+        qcom,jeita-fcc-ranges = <0   50   330000
+                                 51  100  990000
 				101  150  990000
-			151 450  3300000
-			451 600  1650000>;
-	qcom,jeita-fv-ranges =  <0   50   4400000
-			51  100  4400000
+                                 151 450  3300000
+                                 451 600  1650000>;
+        qcom,jeita-fv-ranges =  <0   50   4400000
+                                 51  100  4400000
 				101  150  4400000
-			151 450  4400000
-			451 600  4100000>;
-	qcom,dynamic-fv-ranges = <0    100  4400000
-				101  200  4380000
-				201  300  4360000
-				301  400  4340000
-				401  500  4340000>;
+                                 151 450  4400000
+                                 451 600  4100000>;
 	qcom,checksum = <0x1313>;
 	qcom,gui-version = "PMI8998GUI - 2.0.0.58";
 	qcom,fg-profile-data = [
-			A1 20 86 04
-			28 0B C6 05
-			01 1D 7B 01
-			47 05 43 03
-			A3 17 C6 23
-			A1 44 0E 5A
-			8C 00 00 00
-			11 00 00 00
-			00 00 FB BC
-			CA CD D1 BA
-			26 00 08 00
-			A2 DB AA E4
-			43 FC 28 01
-			61 0C 6C 01
-			5C 06 41 32
-			21 06 09 20
-			27 00 14 00
-			96 20 97 04
-			34 0B A3 05
-			D8 1C AD 02
-			9A 0C 98 0B
-			90 18 B6 23
-			11 44 E1 5A
-			76 00 00 00
-			0E 00 00 00
-			00 00 AE D5
-			2A CA 82 C3
-			1E 00 00 00
-			6E EA AA E4
-			8F FD B2 00
-			44 ED 03 03
-			BD 03 48 22
-			C3 33 CC FF
-			07 10 00 00
-			33 0D 66 46
-			1E 00 40 00
-			60 01 0A FA
-			FF 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
-			00 00 00 00
+		 A1 20 86 04
+		 28 0B C6 05
+		 01 1D 7B 01
+		 47 05 43 03
+		 A3 17 C6 23
+		 A1 44 0E 5A
+		 8C 00 00 00
+		 11 00 00 00
+		 00 00 FB BC
+		 CA CD D1 BA
+		 26 00 08 00
+		 A2 DB AA E4
+		 43 FC 28 01
+		 61 0C 6C 01
+		 5C 06 41 32
+		 21 06 09 20
+		 27 00 14 00
+		 96 20 97 04
+		 34 0B A3 05
+		 D8 1C AD 02
+		 9A 0C 98 0B
+		 90 18 B6 23
+		 11 44 E1 5A
+		 76 00 00 00
+		 0E 00 00 00
+		 00 00 AE D5
+		 2A CA 82 C3
+		 1E 00 00 00
+		 6E EA AA E4
+		 8F FD B2 00
+		 44 ED 03 03
+		 BD 03 48 22
+		 C3 33 CC FF
+		 07 10 00 00
+		 33 0D 66 46
+		 1E 00 40 00
+		 60 01 0A FA
+		 FF 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
+		 00 00 00 00
 	];
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,6 @@ static inline u32 arch_timer_get_cntkctl(void) @@
     static inline void arch_timer_set_cntkctl(u32 cntkctl)
     {
     	asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
-    	isb();
     }
     #endif
@@ Expand Down @@