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

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

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

Pull staging/iio driver updates from Greg KH:
 "Here is the big staging and iio driver patchsets for 4.11-rc1.

  We almost broke even this time around, with only a few thousand lines
  added overall, as we removed the old and obsolete i4l code, but added
  some new drivers for the RPi platform, as well as adding some new IIO
  drivers.

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

* tag 'staging-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (669 commits)
  Staging: vc04_services: Fix the "space prohibited" code style errors
  Staging: vc04_services: Fix the "wrong indent" code style errors
  staging: octeon: Use net_device_stats from struct net_device
  Staging: rtl8192u: ieee80211: ieee80211.h - style fix
  Staging: rtl8192u: ieee80211: ieee80211_tx.c - style fix
  Staging: rtl8192u: ieee80211: rtl819x_BAProc.c - style fix
  Staging: rtl8192u: ieee80211: ieee80211_module.c - style fix
  Staging: rtl8192u: ieee80211: rtl819x_TSProc.c - style fix
  Staging: rtl8192u: r8192U.h - style fix
  Staging: rtl8192u: r8192U_core.c - style fix
  Staging: rtl8192u: r819xU_cmdpkt.c - style fix
  staging: rtl8192u: blank lines aren't necessary before a close brace '}'
  staging: rtl8192u: Adding space after enum and struct definition
  staging: rtl8192u: Adding space after struct definition
  Staging: ks7010: Add required and preferred spaces around operators
  Staging: ks7010: ks*: Remove redundant blank lines
  Staging: ks7010: ks*: Add missing blank lines after declarations
  staging: visorbus, replace init_timer with setup_timer
  staging: vt6656: rxtx.c Removed multiple dereferencing
  staging: vt6656: Alignment match open parenthesis
  ...
parents b2064617 0a441275

Documentation/ABI/testing/sysfs-bus-iio

+13 −2
Original line number Diff line number Diff line
@@ -170,6 +170,16 @@ Description: 
		Has all of the equivalent parameters as per voltageY. Units

		after application of scale and offset are m/s^2.



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

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

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

KernelVersion:	4.11

Contact:	linux-iio@vger.kernel.org

Description:

		Gravity in direction x, y or z (may be arbitrarily assigned

		but should match other such assignments on device).

		Units after application of scale and offset are m/s^2.



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

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

What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_z_raw
@@ -805,7 +815,7 @@ Description: 
		attribute. E.g. if in_voltage0_raw_thresh_rising_value is set to 1200

		and in_voltage0_raw_thresh_rising_hysteresis is set to 50. The event

		will get activated once in_voltage0_raw goes above 1200 and will become

		deactived again once the value falls below 1150.

		deactivated again once the value falls below 1150.



What:		/sys/.../events/in_accel_x_raw_roc_rising_value

What:		/sys/.../events/in_accel_x_raw_roc_falling_value
@@ -1245,7 +1255,8 @@ Description: 
		reflectivity of infrared or ultrasound emitted.

		Often these sensors are unit less and as such conversion

		to SI units is not possible. Higher proximity measurements

		indicate closer objects, and vice versa.

		indicate closer objects, and vice versa. Units after

		application of scale and offset are meters.



What:		/sys/.../iio:deviceX/in_illuminance_input

What:		/sys/.../iio:deviceX/in_illuminance_raw

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

0 → 100644
+18 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/triggerX/trigger_polarity

KernelVersion:	4.11

Contact:	fabrice.gasnier@st.com

Description:

		The STM32 ADC can be configured to use external trigger sources

		(e.g. timers, pwm or exti gpio). Then, it can be tuned to start

		conversions on external trigger by either:

		- "rising-edge"

		- "falling-edge"

		- "both-edges".

		Reading returns current trigger polarity.

		Writing value before enabling conversions sets trigger polarity.



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

KernelVersion:	4.11

Contact:	fabrice.gasnier@st.com

Description:

		List all available trigger_polarity settings.

Documentation/ABI/testing/sysfs-bus-iio-distance-srf08

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

Date:		January 2017

KernelVersion:	4.11

Contact:	linux-iio@vger.kernel.org

Description:

		Show or set the gain boost of the amp, from 0-31 range.

		default 31



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

Date:		January 2017

KernelVersion:	4.11

Contact:	linux-iio@vger.kernel.org

Description:

                Show or set the maximum range between the sensor and the

		first object echoed in meters. Default value is 6.020.

		This setting limits the time the driver is waiting for a

		echo.

		Showing the range of available values is represented as the

		minimum value, the step and the maximum value, all enclosed

		in square brackets.

		Example:

		[0.043 0.043 11.008]

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/triggerX/master_mode_available

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.

		- "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.

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

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

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

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



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

KernelVersion:	4.11

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the current master modes.

		Writing set the master mode



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

KernelVersion:	4.11

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the current sampling frequency.

		Writing an value different of 0 set and start sampling.

		Writing 0 stop sampling.

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ dallas,ds1775 Tiny Digital Thermometer and Thermostat 
dallas,ds3232		Extremely Accurate I²C RTC with Integrated Crystal and SRAM

dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O

dallas,ds75		Digital Thermometer and Thermostat

devantech,srf08		Devantech SRF08 ultrasonic ranger

dlg,da9053		DA9053: flexible system level PMIC with multicore support

dlg,da9063		DA9063: system PMIC for quad-core application processors

domintech,dmard09	DMARD09: 3-axis Accelerometer