Commit 2b1731f8 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

parents 6ae4a60e db2d0b7c

Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
Armadeus ST0700 Adapt. A Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT with

an adapter board.



Required properties:

- compatible: "armadeus,st0700-adapt"

- power-supply: see panel-common.txt



Optional properties:

- backlight: see panel-common.txt

Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt

+5 −1
Original line number Diff line number Diff line
@@ -11,11 +11,13 @@ New driver handles the following 


Required properties:

- compatible:		Must be "samsung,exynos-adc-v1"

				for exynos4412/5250 and s5pv210 controllers.

				for Exynos5250 controllers.

			Must be "samsung,exynos-adc-v2" for

				future controllers.

			Must be "samsung,exynos3250-adc" for

				controllers compatible with ADC of Exynos3250.

			Must be "samsung,exynos4212-adc" for

				controllers compatible with ADC of Exynos4212 and Exynos4412.

			Must be "samsung,exynos7-adc" for

				the ADC in Exynos7 and compatibles

			Must be "samsung,s3c2410-adc" for
@@ -28,6 +30,8 @@ Required properties: 
				the ADC in s3c2443 and compatibles

			Must be "samsung,s3c6410-adc" for

				the ADC in s3c6410 and compatibles

			Must be "samsung,s5pv210-adc" for

				the ADC in s5pv210 and compatibles

- reg:			List of ADC register address range

			- The base address and range of ADC register

			- The base address and range of ADC_PHY register (every

Documentation/devicetree/bindings/mmc/mmc.txt

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ Optional properties: 
  be referred to mmc-pwrseq-simple.txt. But now it's reused as a tunable delay

  waiting for I/O signalling and card power supply to be stable, regardless of

  whether pwrseq-simple is used. Default to 10ms if no available.

- supports-cqe : The presence of this property indicates that the corresponding

  MMC host controller supports HW command queue feature.

- disable-cqe-dcmd: This property indicates that the MMC controller's command

  queue engine (CQE) does not support direct commands (DCMDs).



*NOTE* on CD and WP polarity. To use common for all SD/MMC host controllers line

polarity properties, we have to fix the meaning of the "normal" and "inverted"

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 71

SUBLEVEL = 73

EXTRAVERSION =

NAME = "People's Front"

arch/arc/kernel/troubleshoot.c

+8 −0
Original line number Diff line number Diff line
@@ -179,6 +179,12 @@ void show_regs(struct pt_regs *regs) 
	struct task_struct *tsk = current;

	struct callee_regs *cregs;



	/*

	 * generic code calls us with preemption disabled, but some calls

	 * here could sleep, so re-enable to avoid lockdep splat

	 */

	preempt_enable();



	print_task_path_n_nm(tsk);

	show_regs_print_info(KERN_INFO);
@@ -221,6 +227,8 @@ void show_regs(struct pt_regs *regs) 
	cregs = (struct callee_regs *)current->thread.callee_reg;

	if (cregs)

		show_callee_regs(cregs);



	preempt_disable();

}



void show_kernel_fault_diag(const char *str, struct pt_regs *regs,