Commit c6a677c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging/IIO updates from Greg KH:
 "Here is the big staging tree update for 4.12-rc1.

  It's a big one, adding about 350k new lines of crap^Wcode, mostly all
  in a big dump of media drivers from Intel. But there's other new
  drivers in here as well, yet-another-wifi driver, new IIO drivers, and
  a new crypto accelerator.

  We also deleted a bunch of stuff, mostly in patch cleanups, but also
  the Android ION code has shrunk a lot, and the Android low memory
  killer driver was finally deleted, much to the celebration of the -mm
  developers.

  All of these have been in linux-next with a few build issues that will
  show up when you merge to your tree"

Merge conflicts in the new rtl8723bs driver (due to the wifi changes
this merge window) handled as per linux-next, courtesy of Stephen
Rothwell.

* tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1182 commits)
  staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd
  staging: ks7010: remove line continuations in quoted strings
  staging: vt6656: use tabs instead of spaces
  staging: android: ion: Fix unnecessary initialization of static variable
  staging: media: atomisp: fix range checking on clk_num
  staging: media: atomisp: fix misspelled word in comment
  staging: media: atomisp: kmap() can't fail
  staging: atomisp: remove #ifdef for runtime PM functions
  staging: atomisp: satm include directory is gone
  atomisp: remove some more unused files
  atomisp: remove hmm_load/store/clear indirections
  atomisp: kill off mmgr_free
  atomisp: clean up the hmm init/cleanup indirections
  atomisp: handle allocation calls before init in the hmm layer
  staging: fsl-dpaa2/eth: Add maintainer for Ethernet driver
  staging: fsl-dpaa2/eth: Add TODO file
  staging: fsl-dpaa2/eth: Add trace points
  staging: fsl-dpaa2/eth: Add driver specific stats
  staging: fsl-dpaa2/eth: Add ethtool support
  staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver
  ...
parents e87d51ac 11270059

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com> 
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>

Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>

Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>

Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Documentation/ABI/testing/sysfs-bus-iio

+17 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ Description: 
		then it is to be found in the base device directory.



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

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

What:		/sys/.../iio:deviceX/buffer/sampling_frequency_available

What:		/sys/bus/iio/devices/triggerX/sampling_frequency_available

KernelVersion:	2.6.35
@@ -1593,7 +1594,7 @@ Description: 
		can be processed to siemens per meter.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Raw counter device counts from channel Y. For quadrature
@@ -1601,10 +1602,24 @@ Description: 
		the counts of a single quadrature signal phase from channel Y.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Raw counter device index value from channel Y. This attribute

		provides an absolute positional reference (e.g. a pulse once per

		revolution) which may be used to home positional systems as

		required.



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

KernelVersion:	4.12

Contact:	linux-iio@vger.kernel.org

Description:

		A list of possible counting directions which are:

		- "up"	: counter device is increasing.

		- "down": counter device is decreasing.



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

KernelVersion:	4.12

Contact:	linux-iio@vger.kernel.org

Description:

		Raw counter device counters direction for channel Y.

Documentation/ABI/testing/sysfs-bus-iio-adc-max9611

0 → 100644
+17 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/in_power_shunt_resistor

Date:		March 2017

KernelVersion:	4.12

Contact:	linux-iio@vger.kernel.org

Description: 	The value of the shunt resistor used to compute power drain on

                common input voltage pin (RS+). In Ohms.



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

Date:		March 2017

KernelVersion:	4.12

Contact:	linux-iio@vger.kernel.org

Description: 	The value of the shunt resistor used to compute current flowing

                between RS+ and RS- voltage sense inputs. In Ohms.



These attributes describe a single physical component, exposed as two distinct

attributes as it is used to calculate two different values: power load and

current flowing between RS+ and RS- inputs.

Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8

+8 −16
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/in_count_count_direction_available

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

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

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

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

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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Discrete set of available values for the respective counter

		configuration are listed in this file.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Read-only attribute that indicates whether the counter for

		channel Y is counting up or down.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Count mode for channel Y. Four count modes are available:
@@ -52,7 +44,7 @@ Description: 
			continuously throughout.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Read-only attribute that indicates whether excessive noise is
@@ -60,14 +52,14 @@ Description: 
		irrelevant in non-quadrature clock mode.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		If the counter device supports preset registers, the preset

		count for channel Y is provided by this attribute.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Configure channel Y counter for non-quadrature or quadrature
@@ -88,7 +80,7 @@ Description: 
			decoded for UP/DN clock.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Whether to set channel Y counter with channel Y preset value
@@ -96,14 +88,14 @@ Description: 
		Valid attribute values are boolean.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Active level of channel Y index input; irrelevant in

		non-synchronous load mode.



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

KernelVersion:	4.9

KernelVersion:	4.10

Contact:	linux-iio@vger.kernel.org

Description:

		Configure channel Y counter for non-synchronous or synchronous

Documentation/ABI/testing/sysfs-bus-iio-timer-stm32

+67 −4
Original line number Diff line number Diff line
@@ -3,11 +3,15 @@ KernelVersion: 4.11 
Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the list possible master modes which are:

		- "reset"     :	The UG bit from the TIMx_EGR register is used as trigger output (TRGO).

		- "enable"    : The Counter Enable signal CNT_EN is used as trigger output.

		- "reset"     :	The UG bit from the TIMx_EGR register is

				used as trigger output (TRGO).

		- "enable"    : The Counter Enable signal CNT_EN is used

				as trigger output.

		- "update"    : The update event is selected as trigger output.

				For instance a master timer can then be used as a prescaler for a slave timer.

		- "compare_pulse" : The trigger output send a positive pulse when the CC1IF flag is to be set.

				For instance a master timer can then be used

				as a prescaler for a slave timer.

		- "compare_pulse" : The trigger output send a positive pulse

				    when the CC1IF flag is to be set.

		- "OC1REF"    : OC1REF signal is used as trigger output.

		- "OC2REF"    : OC2REF signal is used as trigger output.

		- "OC3REF"    : OC3REF signal is used as trigger output.
@@ -27,3 +31,62 @@ Description: 
		Reading returns the current sampling frequency.

		Writing an value different of 0 set and start sampling.

		Writing 0 stop sampling.



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

KernelVersion:	4.12

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the current preset value.

		Writing sets the preset value.

		When counting up the counter starts from 0 and fires an

		event when reach preset value.

		When counting down the counter start from preset value

		and fire event when reach 0.



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

KernelVersion:	4.12

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the list possible quadrature modes.



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

KernelVersion:	4.12

Contact:	benjamin.gaignard@st.com

Description:

		Configure the device counter quadrature modes:

		channel_A:

			Encoder A input servers as the count input and B as

			the UP/DOWN direction control input.



		channel_B:

			Encoder B input serves as the count input and A as

			the UP/DOWN direction control input.



		quadrature:

			Encoder A and B inputs are mixed to get direction

			and count with a scale of 0.25.



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

KernelVersion:	4.12

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the list possible enable modes.



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

KernelVersion:	4.12

Contact:	benjamin.gaignard@st.com

Description:

		Configure the device counter enable modes, in all case

		counting direction is set by in_count0_count_direction

		attribute and the counter is clocked by the internal clock.

		always:

			Counter is always ON.



		gated:

			Counting is enabled when connected trigger signal

			level is high else counting is disabled.



		triggered:

			Counting is enabled on rising edge of the connected

			trigger, and remains enabled for the duration of this

			selected mode.

CRA Git | Maintained and supported by SUSTech CRA and CCSE