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

Commit 2475c515 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging and IIO updates from Greg KH:
 "Here are the big staging/iio patches for 4.19-rc1.

  Lots of churn here, with tons of cleanups happening in staging
  drivers, a removal of an old crypto driver that no one was using
  (skein), and the addition of some new IIO drivers. Also added was a
  "gasket" driver from Google that needs loads of work and the erofs
  filesystem.

  Even with adding all of the new drivers and a new filesystem, we are
  only adding about 1000 lines overall to the kernel linecount, which
  shows just how much cleanup happened, and how big the unused crypto
  driver was.

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

* tag 'staging-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (903 commits)
  staging:rtl8192u: Remove unused macro definitions - Style
  staging:rtl8192u: Add spaces around '+' operator - Style
  staging:rtl8192u: Remove stale comment - Style
  staging: rtl8188eu: remove unused mp_custom_oid.h
  staging: fbtft: Add spaces around / - Style
  staging: fbtft: Erases some repetitive usage of function name - Style
  staging: fbtft: Adjust some empty-line problems - Style
  staging: fbtft: Removes one nesting level to help readability - Style
  staging: fbtft: Changes gamma table to define.
  staging: fbtft: A bit more information on dev_err.
  staging: fbtft: Fixes some alignment issues - Style
  staging: fbtft: Puts macro arguments in parenthesis to avoid precedence issues - Style
  staging: rtl8188eu: remove unused array dB_Invert_Table
  staging: rtl8188eu: remove whitespace, add missing blank line
  staging: rtl8188eu: use is_multicast_ether_addr in rtw_sta_mgt.c
  staging: rtl8188eu: remove whitespace - style
  staging: rtl8188eu: cleanup block comment - style
  staging: rtl8188eu: use is_multicast_ether_addr in rtl8188eu_xmit.c
  staging: rtl8188eu: use is_multicast_ether_addr in recv_linux.c
  staging: rtlwifi: refactor rtl_get_tcb_desc
  ...
parents 336722eb e4f6a44c

Documentation/ABI/testing/sysfs-bus-iio

+24 −2
Original line number Diff line number Diff line
@@ -197,6 +197,18 @@ Description: 
		Angle of rotation. Units after application of scale and offset

		are radians.



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

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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		Relative position in direction x or y on a pad (may be

		arbitrarily assigned but should match other such assignments on

		device).

		Units after application of scale and offset are milli percents

		from the pad's size in both directions. Should be calibrated by

		the consumer.



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
@@ -1295,13 +1307,16 @@ What: /sys/.../iio:deviceX/in_intensityY_raw 
What:		/sys/.../iio:deviceX/in_intensityY_ir_raw

What:		/sys/.../iio:deviceX/in_intensityY_both_raw

What:		/sys/.../iio:deviceX/in_intensityY_uv_raw

What:		/sys/.../iio:deviceX/in_intensityY_duv_raw

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:

		Unit-less light intensity. Modifiers both and ir indicate

		that measurements contain visible and infrared light

		components or just infrared light, respectively. Modifier uv indicates

		that measurements contain ultraviolet light components.

		components or just infrared light, respectively. Modifier

		uv indicates that measurements contain ultraviolet light

		components. Modifier duv indicates that measurements

		contain deep ultraviolet light components.



What:		/sys/.../iio:deviceX/in_uvindex_input

KernelVersion:	4.6
@@ -1663,3 +1678,10 @@ KernelVersion: 4.12 
Contact:	linux-iio@vger.kernel.org

Description:

		Raw counter device counters direction for channel Y.



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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled) phase difference reading from channel Y

		that can be processed to radians.
 
 No newline at end of file

Documentation/ABI/testing/sysfs-bus-iio-isl29501

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

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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		This sensor has an automatic gain control (agc) loop

		which sets the analog signal levels at an optimum

		level by controlling programmable gain amplifiers. The

		criteria for optimal gain is determined by the sensor.



		Return the actual gain value as an integer in [0; 65536]

		range when read from.



		The agc gain read when measuring crosstalk shall be

		written into in_proximity0_agc_gain_bias.



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

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

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

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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		The sensor is able to perform correction of distance

		measurements due to changing temperature and ambient

		light conditions. It can be programmed to correct for

		a second order error polynomial.



		Phase data has to be collected when temperature and

		ambient light are modulated independently.



		Then a least squares curve fit to a second order

		polynomial has to be generated from the data. The

		resultant curves have the form ax^2 + bx + c.



		From those two curves, a and b coefficients shall be

		stored in in_proximity0_calib_phase_temp_a and

		in_proximity0_calib_phase_temp_b for temperature and

		in in_proximity0_calib_phase_light_a and

		in_proximity0_calib_phase_light_b for ambient light.



		Those values must be integer in [0; 8355840] range.



		Finally, the c constant is set by the sensor

		internally.



		The value stored in sensor is displayed when read from.

Documentation/ABI/testing/sysfs-bus-iio-light-si1133

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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		Unit-less infrared intensity. The intensity is measured from 1

		dark photodiode. "small" indicate the surface area capturing

		infrared.



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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		Unit-less infrared intensity. The intensity is measured from 4

		dark photodiodes. "large" indicate the surface area capturing

		infrared.



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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		Unit-less light intensity with more diodes.

Documentation/devicetree/bindings/iio/accel/adxl345.txt

+5 −2
Original line number Diff line number Diff line 
Analog Devices ADXL345 3-Axis, +/-(2g/4g/8g/16g) Digital Accelerometer

Analog Devices ADXL345/ADXL375 3-Axis Digital Accelerometers



http://www.analog.com/en/products/mems/accelerometers/adxl345.html

http://www.analog.com/en/products/sensors-mems/accelerometers/adxl375.html



Required properties:

 - compatible : should be "adi,adxl345"

 - compatible : should be one of

		"adi,adxl345"

		"adi,adxl375"

 - reg : the I2C address or SPI chip select number of the sensor



Required properties for SPI bus usage:

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

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
- compatible:	depending on the SoC this should be one of:

			- "amlogic,meson8-saradc" for Meson8

			- "amlogic,meson8b-saradc" for Meson8b

			- "amlogic,meson8m2-saradc" for Meson8m2

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

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

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