Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b1f6d81 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.5-rc7 into char-misc-next. 



This lets us pick up the mei driver changes that we need in order to
handle future merge issues.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 8397c76a 84a1caf1

.mailmap

+1 −0
Original line number 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 <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/ABI/testing/sysfs-block-rssd

+0 −21
Original line number 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

Date:           April 2012

KernelVersion:  3.4

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

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 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_voltage_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_peak_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_voltage-voltage_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

KernelVersion:	2.635

Contact:	linux-iio@vger.kernel.org
@@ -298,14 +300,19 @@ Description: 
		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_altvoltageY_raw

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled, no bias etc.) output voltage for

		channel Y.  The number must always be specified and

		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_altvoltageY&Z_raw

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

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_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

Contact:	linux-iio@vger.kernel.org

Description:
@@ -330,6 +339,8 @@ Description: 


What:		/sys/.../iio:deviceX/out_votlageY_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

Contact:	linux-iio@vger.kernel.org

Description:
@@ -338,6 +349,8 @@ Description: 


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_altvoltageY_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Description:
@@ -346,6 +359,24 @@ Description: 
		normal operation. Y may be suppressed if all outputs are

		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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Documentation/ABI/testing/sysfs-class-mtd

+9 −8
Original line number Diff line number Diff line
@@ -142,13 +142,14 @@ KernelVersion: 3.4 
Contact:	linux-mtd@lists.infradead.org

Description:

		This allows the user to examine and adjust the criteria by which

		mtd returns -EUCLEAN from mtd_read().  If the maximum number of

		bit errors that were corrected on any single region comprising

		an ecc step (as reported by the driver) equals or exceeds this

		value, -EUCLEAN is returned.  Otherwise, absent an error, 0 is

		returned.  Higher layers (e.g., UBI) use this return code as an

		indication that an erase block may be degrading and should be

		scrutinized as a candidate for being marked as bad.

		mtd returns -EUCLEAN from mtd_read() and mtd_read_oob().  If the

		maximum number of bit errors that were corrected on any single

		region comprising an ecc step (as reported by the driver) equals

		or exceeds this value, -EUCLEAN is returned.  Otherwise, absent

		an error, 0 is returned.  Higher layers (e.g., UBI) use this

		return code as an indication that an erase block may be

		degrading and should be scrutinized as a candidate for being

		marked as bad.



		The initial value may be specified by the flash device driver.

		If not, then the default value is ecc_strength.
@@ -167,7 +168,7 @@ Description: 
		block degradation, but high enough to avoid the consequences of

		a persistent return value of -EUCLEAN on devices where sticky

		bitflips occur.  Note that if bitflip_threshold exceeds

		ecc_strength, -EUCLEAN is never returned by mtd_read().

		ecc_strength, -EUCLEAN is never returned by the read operations.

		Conversely, if bitflip_threshold is zero, -EUCLEAN is always

		returned, absent a hard error.

Documentation/DocBook/media/v4l/controls.xml

+1 −1
Original line number Diff line number Diff line
@@ -3988,7 +3988,7 @@ interface and may change in the future.</para> 
	    from RGB to Y'CbCr color space.

	    </entry>

	  </row>

	  <row id = "v4l2-jpeg-chroma-subsampling">

	  <row>

	    <entrytbl spanname="descr" cols="2">

	      <tbody valign="top">

		<row>