Merge "Merge android-4.14.114 (c680586) into msm-4.14" (f362f0c4) · Commits · e / devices / android_kernel_oneplus_sm8150

Makefile

+4 −5

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 14		PATCHLEVEL = 14
	SUBLEVEL = 111		SUBLEVEL = 114
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Petit Gorille		NAME = Petit Gorille

	@@ -494,7 +494,7 @@ CLANG_FLAGS := --target=$(notdir $(CLANG_TRIPLE:%-=%))
	ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)		ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
	$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")		$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
	endif		endif
	GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
	CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
	GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
	endif		endif
	@@ -683,8 +683,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context)
	KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)		KBUILD_CFLAGS += $(call cc-disable-warning, attribute-alias)

	ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE		ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
	KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)		KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
	KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
	else		else
	ifdef CONFIG_PROFILE_ALL_BRANCHES		ifdef CONFIG_PROFILE_ALL_BRANCHES
	KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)		KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)
	@@ -853,7 +852,7 @@ export LDFINAL_vmlinux LDFLAGS_FINAL_vmlinux
	endif		endif

	ifdef CONFIG_CFI_CLANG		ifdef CONFIG_CFI_CLANG
	cfi-clang-flags += -fsanitize=cfi		cfi-clang-flags += -fsanitize=cfi $(call cc-option, -fsplit-lto-unit)
	DISABLE_CFI_CLANG := -fno-sanitize=cfi		DISABLE_CFI_CLANG := -fno-sanitize=cfi
	ifdef CONFIG_MODULES		ifdef CONFIG_MODULES
	cfi-clang-flags += -fsanitize-cfi-cross-dso		cfi-clang-flags += -fsanitize-cfi-cross-dso

arch/arc/configs/hsdk_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,7 @@ CONFIG_NAMESPACES=y
	# CONFIG_UTS_NS is not set		# CONFIG_UTS_NS is not set
	# CONFIG_PID_NS is not set		# CONFIG_PID_NS is not set
	CONFIG_BLK_DEV_INITRD=y		CONFIG_BLK_DEV_INITRD=y
			CONFIG_BLK_DEV_RAM=y
	CONFIG_EMBEDDED=y		CONFIG_EMBEDDED=y
	CONFIG_PERF_EVENTS=y		CONFIG_PERF_EVENTS=y
	# CONFIG_VM_EVENT_COUNTERS is not set		# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/kernel/head.S

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -107,6 +107,7 @@ ENTRY(stext)
	; r2 = pointer to uboot provided cmdline or external DTB in mem		; r2 = pointer to uboot provided cmdline or external DTB in mem
	; These are handled later in handle_uboot_args()		; These are handled later in handle_uboot_args()
	st r0, [@uboot_tag]		st r0, [@uboot_tag]
			st r1, [@uboot_magic]
	st r2, [@uboot_arg]		st r2, [@uboot_arg]
	#endif		#endif

arch/arc/kernel/setup.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ unsigned int intr_to_DE_cnt;

	/* Part of U-boot ABI: see head.S */		/* Part of U-boot ABI: see head.S */
	int __initdata uboot_tag;		int __initdata uboot_tag;
			int __initdata uboot_magic;
	char __initdata *uboot_arg;		char __initdata *uboot_arg;

	const struct machine_desc *machine_desc;		const struct machine_desc *machine_desc;
	@@ -433,6 +434,8 @@ static inline bool uboot_arg_invalid(unsigned long addr)
	#define UBOOT_TAG_NONE 0		#define UBOOT_TAG_NONE 0
	#define UBOOT_TAG_CMDLINE 1		#define UBOOT_TAG_CMDLINE 1
	#define UBOOT_TAG_DTB 2		#define UBOOT_TAG_DTB 2
			/* We always pass 0 as magic from U-boot */
			#define UBOOT_MAGIC_VALUE 0

	void __init handle_uboot_args(void)		void __init handle_uboot_args(void)
	{		{
	@@ -448,6 +451,11 @@ void __init handle_uboot_args(void)
	goto ignore_uboot_args;		goto ignore_uboot_args;
	}		}

			if (uboot_magic != UBOOT_MAGIC_VALUE) {
			pr_warn(IGNORE_ARGS "non zero uboot magic\n");
			goto ignore_uboot_args;
			}

	if (uboot_tag != UBOOT_TAG_NONE &&		if (uboot_tag != UBOOT_TAG_NONE &&
	uboot_arg_invalid((unsigned long)uboot_arg)) {		uboot_arg_invalid((unsigned long)uboot_arg)) {
	pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);

arch/arm/boot/dts/am335x-evm.dts

+22 −4

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,24 @@
	enable-active-high;		enable-active-high;
	};		};

			/* TPS79501 */
			v1_8d_reg: fixedregulator-v1_8d {
			compatible = "regulator-fixed";
			regulator-name = "v1_8d";
			vin-supply = <&vbat>;
			regulator-min-microvolt = <1800000>;
			regulator-max-microvolt = <1800000>;
			};

			/* TPS79501 */
			v3_3d_reg: fixedregulator-v3_3d {
			compatible = "regulator-fixed";
			regulator-name = "v3_3d";
			vin-supply = <&vbat>;
			regulator-min-microvolt = <3300000>;
			regulator-max-microvolt = <3300000>;
			};

	matrix_keypad: matrix_keypad0 {		matrix_keypad: matrix_keypad0 {
	compatible = "gpio-matrix-keypad";		compatible = "gpio-matrix-keypad";
	debounce-delay-ms = <5>;		debounce-delay-ms = <5>;
	@@ -492,10 +510,10 @@
	status = "okay";		status = "okay";

	/* Regulators */		/* Regulators */
	AVDD-supply = <&vaux2_reg>;		AVDD-supply = <&v3_3d_reg>;
	IOVDD-supply = <&vaux2_reg>;		IOVDD-supply = <&v3_3d_reg>;
	DRVDD-supply = <&vaux2_reg>;		DRVDD-supply = <&v3_3d_reg>;
	DVDD-supply = <&vbat>;		DVDD-supply = <&v1_8d_reg>;
	};		};
	};		};