Merge tag 'v3.5-rc6' into x86/mce (92254d31) · Commits · e / devices / android_kernel_teracube_mt6765

.mailmap

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
			Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
	Takashi YOSHII <takashi.yoshii.zj@renesas.com>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
	Yusuke Goda <goda.yusuke@renesas.com>		Yusuke Goda <goda.yusuke@renesas.com>
	Gustavo Padovan <gustavo@las.ic.unicamp.br>		Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/ABI/testing/sysfs-block-rssd

+0 −21

Original line number	Original line	Diff line number	Diff line
	What: /sys/block/rssd*/registers
	Date: March 2012
	KernelVersion: 3.3
	Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Dumps below driver information and
	hardware registers.
	- S ACTive
	- Command Issue
	- Completed
	- PORT IRQ STAT
	- HOST IRQ STAT
	- Allocated
	- Commands in Q

	What: /sys/block/rssd*/status		What: /sys/block/rssd*/status
	Date: April 2012		Date: April 2012
	KernelVersion: 3.4		KernelVersion: 3.4
	Contact: Asai Thambi S P <asamymuthupa@micron.com>		Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Indicates the status of the device.		Description: This is a read-only file. Indicates the status of the device.

	What: /sys/block/rssd*/flags
	Date: May 2012
	KernelVersion: 3.5
	Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Dumps the flags in port and driver
	data structure

Documentation/ABI/testing/sysfs-bus-iio

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -219,6 +219,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_scale
	What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale		What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale
	What: /sys/bus/iio/devices/iio:deviceX/in_voltage_scale		What: /sys/bus/iio/devices/iio:deviceX/in_voltage_scale
	What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale		What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale
			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale
	What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale		What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale
	What: /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale		What: /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
	What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale		What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
	@@ -273,6 +274,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available
	What: /sys/.../iio:deviceX/in_voltageX_scale_available		What: /sys/.../iio:deviceX/in_voltageX_scale_available
	What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available		What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available
	What: /sys/.../iio:deviceX/out_voltageX_scale_available		What: /sys/.../iio:deviceX/out_voltageX_scale_available
			What: /sys/.../iio:deviceX/out_altvoltageX_scale_available
	What: /sys/.../iio:deviceX/in_capacitance_scale_available		What: /sys/.../iio:deviceX/in_capacitance_scale_available
	KernelVersion: 2.635		KernelVersion: 2.635
	Contact: linux-iio@vger.kernel.org		Contact: linux-iio@vger.kernel.org
	@@ -298,14 +300,19 @@ Description:
	gives the 3dB frequency of the filter in Hz.		gives the 3dB frequency of the filter in Hz.

	What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw		What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw
			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw
	KernelVersion: 2.6.37		KernelVersion: 2.6.37
	Contact: linux-iio@vger.kernel.org		Contact: linux-iio@vger.kernel.org
	Description:		Description:
	Raw (unscaled, no bias etc.) output voltage for		Raw (unscaled, no bias etc.) output voltage for
	channel Y. The number must always be specified and		channel Y. The number must always be specified and
	unique if the output corresponds to a single channel.		unique if the output corresponds to a single channel.
			While DAC like devices typically use out_voltage,
			a continuous frequency generating device, such as
			a DDS or PLL should use out_altvoltage.

	What: /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw		What: /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw
			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw
	KernelVersion: 2.6.37		KernelVersion: 2.6.37
	Contact: linux-iio@vger.kernel.org		Contact: linux-iio@vger.kernel.org
	Description:		Description:
	@@ -316,6 +323,8 @@ Description:

	What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode		What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode
	What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode		What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode
			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode
			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode
	KernelVersion: 2.6.38		KernelVersion: 2.6.38
	Contact: linux-iio@vger.kernel.org		Contact: linux-iio@vger.kernel.org
	Description:		Description:
	@@ -330,6 +339,8 @@ Description:

	What: /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available		What: /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
	What: /sys/.../iio:deviceX/out_voltage_powerdown_mode_available		What: /sys/.../iio:deviceX/out_voltage_powerdown_mode_available
			What: /sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available
			What: /sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available
	KernelVersion: 2.6.38		KernelVersion: 2.6.38
	Contact: linux-iio@vger.kernel.org		Contact: linux-iio@vger.kernel.org
	Description:		Description:
	@@ -338,6 +349,8 @@ Description:

	What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown		What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown
	What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown		What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown
			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown
			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown
	KernelVersion: 2.6.38		KernelVersion: 2.6.38
	Contact: linux-iio@vger.kernel.org		Contact: linux-iio@vger.kernel.org
	Description:		Description:
	@@ -346,6 +359,24 @@ Description:
	normal operation. Y may be suppressed if all outputs are		normal operation. Y may be suppressed if all outputs are
	controlled together.		controlled together.

			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency
			KernelVersion: 3.4.0
			Contact: linux-iio@vger.kernel.org
			Description:
			Output frequency for channel Y in Hz. The number must always be
			specified and unique if the output corresponds to a single
			channel.

			What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase
			KernelVersion: 3.4.0
			Contact: linux-iio@vger.kernel.org
			Description:
			Phase in radians of one frequency/clock output Y
			(out_altvoltageY) relative to another frequency/clock output
			(out_altvoltageZ) of the device X. The number must always be
			specified and unique if the output corresponds to a single
			channel.

	What: /sys/bus/iio/devices/iio:deviceX/events		What: /sys/bus/iio/devices/iio:deviceX/events
	KernelVersion: 2.6.35		KernelVersion: 2.6.35
	Contact: linux-iio@vger.kernel.org		Contact: linux-iio@vger.kernel.org

Documentation/DocBook/media/v4l/pixfmt.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -986,13 +986,13 @@ http://www.thedirks.org/winnov/</ulink></para></entry>
	<row id="V4L2-PIX-FMT-Y4">		<row id="V4L2-PIX-FMT-Y4">
	<entry><constant>V4L2_PIX_FMT_Y4</constant></entry>		<entry><constant>V4L2_PIX_FMT_Y4</constant></entry>
	<entry>'Y04 '</entry>		<entry>'Y04 '</entry>
	<entry>Old 4-bit greyscale format. Only the least significant 4 bits of each byte are used,		<entry>Old 4-bit greyscale format. Only the most significant 4 bits of each byte are used,
	the other bits are set to 0.</entry>		the other bits are set to 0.</entry>
	</row>		</row>
	<row id="V4L2-PIX-FMT-Y6">		<row id="V4L2-PIX-FMT-Y6">
	<entry><constant>V4L2_PIX_FMT_Y6</constant></entry>		<entry><constant>V4L2_PIX_FMT_Y6</constant></entry>
	<entry>'Y06 '</entry>		<entry>'Y06 '</entry>
	<entry>Old 6-bit greyscale format. Only the least significant 6 bits of each byte are used,		<entry>Old 6-bit greyscale format. Only the most significant 6 bits of each byte are used,
	the other bits are set to 0.</entry>		the other bits are set to 0.</entry>
	</row>		</row>
	</tbody>		</tbody>

Documentation/DocBook/media/v4l/v4l2.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -560,6 +560,7 @@ and discussions on the V4L mailing list.</revremark>
	&sub-g-tuner;		&sub-g-tuner;
	&sub-log-status;		&sub-log-status;
	&sub-overlay;		&sub-overlay;
			&sub-prepare-buf;
	&sub-qbuf;		&sub-qbuf;
	&sub-querybuf;		&sub-querybuf;
	&sub-querycap;		&sub-querycap;
	@@ -567,7 +568,6 @@ and discussions on the V4L mailing list.</revremark>
	&sub-query-dv-preset;		&sub-query-dv-preset;
	&sub-query-dv-timings;		&sub-query-dv-timings;
	&sub-querystd;		&sub-querystd;
	&sub-prepare-buf;
	&sub-reqbufs;		&sub-reqbufs;
	&sub-s-hw-freq-seek;		&sub-s-hw-freq-seek;
	&sub-streamon;		&sub-streamon;