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

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

Pull staging/IIO updates from Greg KH:
 "Here's the large set of staging and iio driver patches for 4.13-rc1.

  After over 500 patches, we removed about 200 more lines of code than
  we added, not great, but we added some new IIO drivers for unsupported
  hardware, so it's an overall win.

  Also here are lots of small fixes, and some tty core api additions
  (with the tty maintainer's ack) for the speakup drivers, those are
  finally getting some much needed cleanups and are looking much better
  now than before. Full details in the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (529 commits)
  staging: lustre: replace kmalloc with kmalloc_array
  Staging: ion: fix code style warning from NULL comparisons
  staging: fsl-mc: make dprc.h header private
  staging: fsl-mc: move mc-cmd.h contents in the public header
  staging: fsl-mc: move mc-sys.h contents in the public header
  staging: fsl-mc: fix a few implicit includes
  staging: fsl-mc: remove dpmng API files
  staging: fsl-mc: move rest of mc-bus.h to private header
  staging: fsl-mc: move couple of definitions to public header
  staging: fsl-mc: move irq domain creation prototype to public header
  staging: fsl-mc: turn several exported functions static
  staging: fsl-mc: delete prototype of unimplemented function
  staging: fsl-mc: delete duplicated function prototypes
  staging: fsl-mc: decouple the mc-bus public headers from dprc.h
  staging: fsl-mc: drop useless #includes
  staging: fsl-mc: be consistent when checking strcmp() return
  staging: fsl-mc: move comparison before strcmp() call
  staging: speakup: make function ser_to_dev static
  staging: ks7010: fix spelling mistake: "errror" -> "error"
  staging: rtl8192e: fix spelling mistake: "respose" -> "response"
  ...
parents 362f6729 9b326dfc

Documentation/ABI/testing/sysfs-bus-iio

+11 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,17 @@ Description: 
		guarantees that the hardware fifo is flushed to the device

		buffer.



What:		/sys/bus/iio/devices/iio:device*/buffer/hwfifo_timeout

KernelVersion:	4.12

Contact:	linux-iio@vger.kernel.org

Description:

		A read/write property to provide capability to delay reporting of

		samples till a timeout is reached. This allows host processors to

		sleep, while the sensor is storing samples in its internal fifo.

		The maximum timeout in seconds can be specified by setting

		hwfifo_timeout.The current delay can be read by reading

		hwfifo_timeout. A value of 0 means that there is no timeout.



What:		/sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark

KernelVersion: 4.2

Contact:	linux-iio@vger.kernel.org

Documentation/ABI/testing/sysfs-bus-iio-meas-spec

+0 −1
Original line number Diff line number Diff line
@@ -5,4 +5,3 @@ Description: 
                Reading returns either '1' or '0'. '1' means that the

                battery level supplied to sensor is below 2.25V.

                This ABI is available for tsys02d, htu21, ms8607
 
		This ABI is available for htu21, ms8607

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

+63 −0
Original line number Diff line number Diff line
@@ -16,6 +16,54 @@ Description: 
		- "OC2REF"    : OC2REF signal is used as trigger output.

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

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

		Additional modes (on TRGO2 only):

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

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

		- "compare_pulse_OC4REF":

		  OC4REF rising or falling edges generate pulses.

		- "compare_pulse_OC6REF":

		  OC6REF rising or falling edges generate pulses.

		- "compare_pulse_OC4REF_r_or_OC6REF_r":

		  OC4REF or OC6REF rising edges generate pulses.

		- "compare_pulse_OC4REF_r_or_OC6REF_f":

		  OC4REF rising or OC6REF falling edges generate pulses.

		- "compare_pulse_OC5REF_r_or_OC6REF_r":

		  OC5REF or OC6REF rising edges generate pulses.

		- "compare_pulse_OC5REF_r_or_OC6REF_f":

		  OC5REF rising or OC6REF falling edges generate pulses.



		+-----------+   +-------------+            +---------+

		| Prescaler +-> | Counter     |        +-> | Master  | TRGO(2)

		+-----------+   +--+--------+-+        |-> | Control +-->

		                   |        |          ||  +---------+

		                +--v--------+-+ OCxREF ||  +---------+

		                | Chx compare +----------> | Output  | ChX

		                +-----------+-+         |  | Control +-->

		                      .     |           |  +---------+

		                      .     |           |    .

		                +-----------v-+ OC6REF  |    .

		                | Ch6 compare +---------+>

		                +-------------+



		Example with: "compare_pulse_OC4REF_r_or_OC6REF_r":



		                X

		              X   X

		            X .   . X

		          X   .   .   X

		        X     .   .     X

		count X .     .   .     . X

		        .     .   .     .

		        .     .   .     .

		        +---------------+

		OC4REF  |     .   .     |

		      +-+     .   .     +-+

		        .     +---+     .

		OC6REF  .     |   |     .

		      +-------+   +-------+

		        +-+   +-+

		TRGO2   | |   | |

		      +-+ +---+ +---------+



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

KernelVersion:	4.11
@@ -90,3 +138,18 @@ Description: 
			Counting is enabled on rising edge of the connected

			trigger, and remains enabled for the duration of this

			selected mode.



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

KernelVersion:	4.13

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the list possible trigger modes.



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

KernelVersion:	4.13

Contact:	benjamin.gaignard@st.com

Description:

		Configure the device counter trigger mode

		counting direction is set by in_count0_count_direction

		attribute and the counter is clocked by the connected trigger

		rising edges.

Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


Required properties:

- compatible:	depending on the SoC this should be one of:

			- "amlogic,meson8-saradc" for Meson8

			- "amlogic,meson8b-saradc" for Meson8b

			- "amlogic,meson-gxbb-saradc" for GXBB

			- "amlogic,meson-gxl-saradc" for GXL

			- "amlogic,meson-gxm-saradc" for GXM

Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt

+4 −5
Original line number Diff line number Diff line 
* Renesas RCar GyroADC device driver

* Renesas R-Car GyroADC device driver



The GyroADC block is a reduced SPI block with up to 8 chipselect lines,

which supports the SPI protocol of a selected few SPI ADCs. The SPI ADCs
@@ -16,8 +16,7 @@ Required properties: 
- clocks:	References to all the clocks specified in the clock-names

		property as specified in

		Documentation/devicetree/bindings/clock/clock-bindings.txt.

- clock-names:	Shall contain "fck" and "if". The "fck" is the GyroADC block

		clock, the "if" is the interface clock.

- clock-names:	Shall contain "fck". The "fck" is the GyroADC block clock.

- power-domains: Must contain a reference to the PM domain, if available.

- #address-cells: Should be <1> (setting for the subnodes) for all ADCs

		except for "fujitsu,mb88101a". Should be <0> (setting for
@@ -75,8 +74,8 @@ Example: 
	adc@e6e54000 {

		compatible = "renesas,r8a7791-gyroadc", "renesas,rcar-gyroadc";

		reg = <0 0xe6e54000 0 64>;

		clocks = <&mstp9_clks R8A7791_CLK_GYROADC>, <&clk_65m>;

		clock-names = "fck", "if";

		clocks = <&mstp9_clks R8A7791_CLK_GYROADC>;

		clock-names = "fck";

		power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;



		pinctrl-0 = <&adc_pins>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE