Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued (94558e26) · Commits · e / devices / android_kernel_oneplus_sm8150

.mailmap

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
	Andrew Morton <akpm@linux-foundation.org>		Andrew Morton <akpm@linux-foundation.org>
	Andrew Vasquez <andrew.vasquez@qlogic.com>		Andrew Vasquez <andrew.vasquez@qlogic.com>
	Andy Adamson <andros@citi.umich.edu>		Andy Adamson <andros@citi.umich.edu>
			Antoine Tenart <antoine.tenart@free-electrons.com>
	Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>		Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
	Archit Taneja <archit@ti.com>		Archit Taneja <archit@ti.com>
	Arnaud Patard <arnaud.patard@rtp-net.org>		Arnaud Patard <arnaud.patard@rtp-net.org>
	@@ -30,6 +31,9 @@ Axel Lin <axel.lin@gmail.com>
	Ben Gardner <bgardner@wabtec.com>		Ben Gardner <bgardner@wabtec.com>
	Ben M Cahill <ben.m.cahill@intel.com>		Ben M Cahill <ben.m.cahill@intel.com>
	Björn Steinbrink <B.Steinbrink@gmx.de>		Björn Steinbrink <B.Steinbrink@gmx.de>
			Boris Brezillon <boris.brezillon@free-electrons.com>
			Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
			Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
	Brian Avery <b.avery@hp.com>		Brian Avery <b.avery@hp.com>
	Brian King <brking@us.ibm.com>		Brian King <brking@us.ibm.com>
	Christoph Hellwig <hch@lst.de>		Christoph Hellwig <hch@lst.de>
	@@ -89,6 +93,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
	Linas Vepstas <linas@austin.ibm.com>		Linas Vepstas <linas@austin.ibm.com>
	Mark Brown <broonie@sirena.org.uk>		Mark Brown <broonie@sirena.org.uk>
	Matthieu CASTET <castet.matthieu@free.fr>		Matthieu CASTET <castet.matthieu@free.fr>
			Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
	Mayuresh Janorkar <mayur@ti.com>		Mayuresh Janorkar <mayur@ti.com>
	Michael Buesch <m@bues.ch>		Michael Buesch <m@bues.ch>
	Michel Dänzer <michel@tungstengraphics.com>		Michel Dänzer <michel@tungstengraphics.com>
	@@ -122,6 +127,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
	Sascha Hauer <s.hauer@pengutronix.de>		Sascha Hauer <s.hauer@pengutronix.de>
	S.Çağlar Onur <caglar@pardus.org.tr>		S.Çağlar Onur <caglar@pardus.org.tr>
	Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
			Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>

CREDITS

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig

	N: Mauro Carvalho Chehab		N: Mauro Carvalho Chehab
	E: m.chehab@samsung.org		E: m.chehab@samsung.org
			E: mchehab@osg.samsung.com
	E: mchehab@infradead.org		E: mchehab@infradead.org
	D: Media subsystem (V4L/DVB) drivers and core		D: Media subsystem (V4L/DVB) drivers and core
	D: EDAC drivers and EDAC 3.0 core rework		D: EDAC drivers and EDAC 3.0 core rework

Documentation/ABI/testing/configfs-usb-gadget-uvc

+29 −29

Original line number	Original line	Diff line number	Diff line
	What: /config/usb-gadget/gadget/functions/uvc.name		What: /config/usb-gadget/gadget/functions/uvc.name
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: UVC function directory		Description: UVC function directory

	streaming_maxburst - 0..15 (ss only)		streaming_maxburst - 0..15 (ss only)
	@@ -9,37 +9,37 @@ Description: UVC function directory

	What: /config/usb-gadget/gadget/functions/uvc.name/control		What: /config/usb-gadget/gadget/functions/uvc.name/control
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Control descriptors		Description: Control descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/class		What: /config/usb-gadget/gadget/functions/uvc.name/control/class
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Class descriptors		Description: Class descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/class/ss		What: /config/usb-gadget/gadget/functions/uvc.name/control/class/ss
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Super speed control class descriptors		Description: Super speed control class descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/class/fs		What: /config/usb-gadget/gadget/functions/uvc.name/control/class/fs
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Full speed control class descriptors		Description: Full speed control class descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal		What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Terminal descriptors		Description: Terminal descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output		What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Output terminal descriptors		Description: Output terminal descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default		What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Default output terminal descriptors		Description: Default output terminal descriptors

	All attributes read only:		All attributes read only:
	@@ -53,12 +53,12 @@ Description: Default output terminal descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera		What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Camera terminal descriptors		Description: Camera terminal descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default		What: /config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Default camera terminal descriptors		Description: Default camera terminal descriptors

	All attributes read only:		All attributes read only:
	@@ -75,12 +75,12 @@ Description: Default camera terminal descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/processing		What: /config/usb-gadget/gadget/functions/uvc.name/control/processing
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Processing unit descriptors		Description: Processing unit descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/processing/default		What: /config/usb-gadget/gadget/functions/uvc.name/control/processing/default
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Default processing unit descriptors		Description: Default processing unit descriptors

	All attributes read only:		All attributes read only:
	@@ -94,49 +94,49 @@ Description: Default processing unit descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/header		What: /config/usb-gadget/gadget/functions/uvc.name/control/header
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Control header descriptors		Description: Control header descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/control/header/name		What: /config/usb-gadget/gadget/functions/uvc.name/control/header/name
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Specific control header descriptors		Description: Specific control header descriptors

	dwClockFrequency		dwClockFrequency
	bcdUVC		bcdUVC
	What: /config/usb-gadget/gadget/functions/uvc.name/streaming		What: /config/usb-gadget/gadget/functions/uvc.name/streaming
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Streaming descriptors		Description: Streaming descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Streaming class descriptors		Description: Streaming class descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Super speed streaming class descriptors		Description: Super speed streaming class descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: High speed streaming class descriptors		Description: High speed streaming class descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Full speed streaming class descriptors		Description: Full speed streaming class descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Color matching descriptors		Description: Color matching descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Default color matching descriptors		Description: Default color matching descriptors

	All attributes read only:		All attributes read only:
	@@ -150,12 +150,12 @@ Description: Default color matching descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: MJPEG format descriptors		Description: MJPEG format descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Specific MJPEG format descriptors		Description: Specific MJPEG format descriptors

	All attributes read only,		All attributes read only,
	@@ -174,7 +174,7 @@ Description: Specific MJPEG format descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Specific MJPEG frame descriptors		Description: Specific MJPEG frame descriptors

	dwFrameInterval - indicates how frame interval can be		dwFrameInterval - indicates how frame interval can be
	@@ -196,12 +196,12 @@ Description: Specific MJPEG frame descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Uncompressed format descriptors		Description: Uncompressed format descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Specific uncompressed format descriptors		Description: Specific uncompressed format descriptors

	bmaControls - this format's data for bmaControls in		bmaControls - this format's data for bmaControls in
	@@ -221,7 +221,7 @@ Description: Specific uncompressed format descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Specific uncompressed frame descriptors		Description: Specific uncompressed frame descriptors

	dwFrameInterval - indicates how frame interval can be		dwFrameInterval - indicates how frame interval can be
	@@ -243,12 +243,12 @@ Description: Specific uncompressed frame descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Streaming header descriptors		Description: Streaming header descriptors

	What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header/name		What: /config/usb-gadget/gadget/functions/uvc.name/streaming/header/name
	Date: Dec 2014		Date: Dec 2014
	KernelVersion: 3.20		KernelVersion: 4.0
	Description: Specific streaming header descriptors		Description: Specific streaming header descriptors

	All attributes read only:		All attributes read only:

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+1 −1

Original line number	Original line	Diff line number	Diff line
	What /sys/bus/iio/devices/iio:deviceX/in_proximity_raw		What /sys/bus/iio/devices/iio:deviceX/in_proximity_input
	Date: March 2014		Date: March 2014
	KernelVersion: 3.15		KernelVersion: 3.15
	Contact: Matt Ranostay <mranostay@gmail.com>		Contact: Matt Ranostay <mranostay@gmail.com>

Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt

+21 −5

Original line number	Original line	Diff line number	Diff line
	Analog Device ADV7511(W)/13 HDMI Encoders		Analog Device ADV7511(W)/13/33 HDMI Encoders
	-----------------------------------------		-----------------------------------------

	The ADV7511, ADV7511W and ADV7513 are HDMI audio and video transmitters		The ADV7511, ADV7511W, ADV7513 and ADV7533 are HDMI audio and video transmitters
	compatible with HDMI 1.4 and DVI 1.0. They support color space conversion,		compatible with HDMI 1.4 and DVI 1.0. They support color space conversion,
	S/PDIF, CEC and HDCP.		S/PDIF, CEC and HDCP. ADV7533 supports the DSI interface for input pixels, while
			the others support RGB interface.

	Required properties:		Required properties:

	- compatible: Should be one of "adi,adv7511", "adi,adv7511w" or "adi,adv7513"		- compatible: Should be one of:
			"adi,adv7511"
			"adi,adv7511w"
			"adi,adv7513"
			"adi,adv7533"

	- reg: I2C slave address		- reg: I2C slave address

	The ADV7511 supports a large number of input data formats that differ by their		The ADV7511 supports a large number of input data formats that differ by their
	@@ -32,6 +38,11 @@ The following input format properties are required except in "rgb 1x" and
	- adi,input-justification: The input bit justification ("left", "evenly",		- adi,input-justification: The input bit justification ("left", "evenly",
	"right").		"right").

			The following properties are required for ADV7533:

			- adi,dsi-lanes: Number of DSI data lanes connected to the DSI host. It should
			be one of 1, 2, 3 or 4.

	Optional properties:		Optional properties:

	- interrupts: Specifier for the ADV7511 interrupt		- interrupts: Specifier for the ADV7511 interrupt
	@@ -42,13 +53,18 @@ Optional properties:
	- adi,embedded-sync: The input uses synchronization signals embedded in the		- adi,embedded-sync: The input uses synchronization signals embedded in the
	data stream (similar to BT.656). Defaults to separate H/V synchronization		data stream (similar to BT.656). Defaults to separate H/V synchronization
	signals.		signals.
			- adi,disable-timing-generator: Only for ADV7533. Disables the internal timing
			generator. The chip will rely on the sync signals in the DSI data lanes,
			rather than generate its own timings for HDMI output.

	Required nodes:		Required nodes:

	The ADV7511 has two video ports. Their connections are modelled using the OF		The ADV7511 has two video ports. Their connections are modelled using the OF
	graph bindings specified in Documentation/devicetree/bindings/graph.txt.		graph bindings specified in Documentation/devicetree/bindings/graph.txt.

	- Video port 0 for the RGB or YUV input		- Video port 0 for the RGB, YUV or DSI input. In the case of ADV7533, the
			remote endpoint phandle should be a reference to a valid mipi_dsi_host device
			node.
	- Video port 1 for the HDMI output		- Video port 1 for the HDMI output