Merge drm/drm-next into drm-misc-next (6542e9ad) · Commits · jan.koester / Linux

Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt

+6 −19

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@ Required properties:
		- samsung,pll-clock-frequency: specifies frequency of the oscillator clock
		- #address-cells, #size-cells: should be set respectively to <1> and <0>
		according to DSI host bindings (see MIPI DSI bindings [1])
		- samsung,burst-clock-frequency: specifies DSI frequency in high-speed burst
		mode
		- samsung,esc-clock-frequency: specifies DSI frequency in escape mode

		Optional properties:
		- power-domains: a phandle to DSIM power domain node
		@@ -29,25 +32,9 @@ Child nodes:
		Should contain DSI peripheral nodes (see MIPI DSI bindings [1]).

		Video interfaces:
		Device node can contain video interface port nodes according to [2].
		The following are properties specific to those nodes:

		port node inbound:
		- reg: (required) must be 0.
		port node outbound:
		- reg: (required) must be 1.

		endpoint node connected from mic node (reg = 0):
		- remote-endpoint: specifies the endpoint in mic node. This node is required
		for Exynos5433 mipi dsi. So mic can access to panel node
		throughout this dsi node.
		endpoint node connected to panel node (reg = 1):
		- remote-endpoint: specifies the endpoint in panel node. This node is
		required in all kinds of exynos mipi dsi to represent
		the connection between mipi dsi and panel.
		- samsung,burst-clock-frequency: specifies DSI frequency in high-speed burst
		mode
		- samsung,esc-clock-frequency: specifies DSI frequency in escape mode
		Device node can contain following video interface port nodes according to [2]:
		0: RGB input,
		1: DSI output

		[1]: Documentation/devicetree/bindings/display/mipi-dsi-bus.txt
		[2]: Documentation/devicetree/bindings/media/video-interfaces.txt

Documentation/devicetree/bindings/input/gpio-keys.txt

+1 −1

Original line number	Diff line number	Diff line
		Device-Tree bindings for input/gpio_keys.c keyboard driver
		Device-Tree bindings for input/keyboard/gpio_keys.c keyboard driver

		Required properties:
		- compatible = "gpio-keys";

Documentation/media/uapi/dvb/video_function_calls.rst

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,4 +33,3 @@ Video Function Calls
		video-clear-buffer
		video-set-streamtype
		video-set-format
		video-set-attributes

MAINTAINERS

+15 −9

Original line number	Diff line number	Diff line
		@@ -4761,8 +4761,8 @@ F: include/uapi/drm/
		F: include/linux/vga*

		DRM DRIVERS AND MISC GPU PATCHES
		M: Gustavo Padovan <gustavo@padovan.org>
		M: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
		M: Maxime Ripard <maxime.ripard@bootlin.com>
		M: Sean Paul <sean@poorly.run>
		W: https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
		S: Maintained
		@@ -9727,13 +9727,6 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/
		S: Maintained
		F: drivers/media/dvb-frontends/mn88473*

		PCI DRIVER FOR MOBIVEIL PCIE IP
		M: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
		L: linux-pci@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
		F: drivers/pci/controller/pcie-mobiveil.c

		MODULE SUPPORT
		M: Jessica Yu <jeyu@kernel.org>
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
		@@ -10963,7 +10956,7 @@ M: Willy Tarreau <willy@haproxy.com>
		M: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
		S: Odd Fixes
		F: Documentation/auxdisplay/lcd-panel-cgram.txt
		F: drivers/misc/panel.c
		F: drivers/auxdisplay/panel.c

		PARALLEL PORT SUBSYSTEM
		M: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
		@@ -11151,6 +11144,13 @@ F: include/uapi/linux/switchtec_ioctl.h
		F: include/linux/switchtec.h
		F: drivers/ntb/hw/mscc/

		PCI DRIVER FOR MOBIVEIL PCIE IP
		M: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
		L: linux-pci@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/pci/mobiveil-pcie.txt
		F: drivers/pci/controller/pcie-mobiveil.c

		PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
		M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
		M: Jason Cooper <jason@lakedaemon.net>
		@@ -11217,8 +11217,14 @@ F: tools/pci/

		PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
		M: Russell Currey <ruscur@russell.cc>
		M: Sam Bobroff <sbobroff@linux.ibm.com>
		M: Oliver O'Halloran <oohall@gmail.com>
		L: linuxppc-dev@lists.ozlabs.org
		S: Supported
		F: Documentation/PCI/pci-error-recovery.txt
		F: drivers/pci/pcie/aer.c
		F: drivers/pci/pcie/dpc.c
		F: drivers/pci/pcie/err.c
		F: Documentation/powerpc/eeh-pci-error-recovery.txt
		F: arch/powerpc/kernel/eeh*.c
		F: arch/powerpc/platforms//eeh.c

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 0
		EXTRAVERSION = -rc5
		EXTRAVERSION = -rc6
		NAME = Merciless Moray

		# DOCUMENTATION