Merge pull request #18 from derfelot/lineage-18.1 (a6c7f978) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/devicetree/bindings/net/nfc/nxp-nci.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ Example (for ARM-based BeagleBone with NPC100 NFC controller on I2C2):
		clock-frequency = <100000>;

		interrupt-parent = <&gpio1>;
		interrupts = <29 GPIO_ACTIVE_HIGH>;
		interrupts = <29 IRQ_TYPE_LEVEL_HIGH>;

		enable-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
		firmware-gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;

Documentation/devicetree/bindings/net/nfc/pn544.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ Example (for ARM-based BeagleBone with PN544 on I2C2):
		clock-frequency = <400000>;

		interrupt-parent = <&gpio1>;
		interrupts = <17 GPIO_ACTIVE_HIGH>;
		interrupts = <17 IRQ_TYPE_LEVEL_HIGH>;

		enable-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
		firmware-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;

Makefile

+2 −2

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 247
		SUBLEVEL = 251
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -349,7 +349,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump
		AWK = awk
		GENKSYMS = scripts/genksyms/genksyms
		INSTALLKERNEL := installkernel
		DEPMOD = /sbin/depmod
		DEPMOD = depmod
		PERL = perl
		PYTHON = python
		CHECK = sparse

arch/arc/kernel/stacktrace.c

+15 −8

Original line number	Diff line number	Diff line
		@@ -39,15 +39,15 @@

		#ifdef CONFIG_ARC_DW2_UNWIND

		static void seed_unwind_frame_info(struct task_struct *tsk,
		struct pt_regs *regs,
		static int
		seed_unwind_frame_info(struct task_struct tsk, struct pt_regs regs,
		struct unwind_frame_info *frame_info)
		{
		/*
		* synchronous unwinding (e.g. dump_stack)
		* - uses current values of SP and friends
		*/
		if (tsk == NULL && regs == NULL) {
		if (regs == NULL && (tsk == NULL \|\| tsk == current)) {
		unsigned long fp, sp, blink, ret;
		frame_info->task = current;

		@@ -66,11 +66,15 @@ static void seed_unwind_frame_info(struct task_struct *tsk,
		frame_info->call_frame = 0;
		} else if (regs == NULL) {
		/*
		* Asynchronous unwinding of sleeping task
		* - Gets SP etc from task's pt_regs (saved bottom of kernel
		* mode stack of task)
		* Asynchronous unwinding of a likely sleeping task
		* - first ensure it is actually sleeping
		* - if so, it will be in __switch_to, kernel mode SP of task
		* is safe-kept and BLINK at a well known location in there
		*/

		if (tsk->state == TASK_RUNNING)
		return -1;

		frame_info->task = tsk;

		frame_info->regs.r27 = TSK_K_FP(tsk);
		@@ -104,6 +108,8 @@ static void seed_unwind_frame_info(struct task_struct *tsk,
		frame_info->regs.r63 = regs->ret;
		frame_info->call_frame = 0;
		}

		return 0;
		}

		#endif
		@@ -117,7 +123,8 @@ arc_unwind_core(struct task_struct tsk, struct pt_regs regs,
		unsigned int address;
		struct unwind_frame_info frame_info;

		seed_unwind_frame_info(tsk, regs, &frame_info);
		if (seed_unwind_frame_info(tsk, regs, &frame_info))
		return 0;

		while (1) {
		address = UNW_PC(&frame_info);

arch/arm/boot/dts/at91-sama5d3_xplained.dts

+7 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,11 @@
		atmel,pins =
		<AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PE9, conflicts with A9 */
		};
		pinctrl_usb_default: usb_default {
		atmel,pins =
		<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
		AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
		};
		};
		};
		};
		@@ -288,6 +293,8 @@
		&pioE 3 GPIO_ACTIVE_LOW
		&pioE 4 GPIO_ACTIVE_LOW
		>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_usb_default>;
		status = "okay";
		};