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

Commit 25a0dc4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging and IIO driver updates from Greg KH:
 "Here is the big Staging and IIO driver update for 4.8-rc1.

  We ended up adding more code than removing, again, but it's not all
  that bad.  Lots of cleanups all over the staging tree, and new IIO
  drivers, full details in the shortlog.

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

* tag 'staging-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (417 commits)
  drivers:iio:accel:mma8452: removed unwanted return statements
  drivers:iio:accel:mma8452: added cleanup provision in case of failure.
  iio: Add iio.git tree to MAINTAINERS
  iio:st_pressure: clean useless static channel initializers
  iio:st_pressure:lps22hb: temperature support
  iio:st_pressure:lps22hb: open drain support
  iio:st_pressure: temperature triggered buffering
  iio:st_pressure: document sampling gains
  iio:st_pressure: align storagebits on power of 2
  iio:st_sensors: align on storagebits boundaries
  staging:iio:lis3l02dq drop separate driver
  iio: accel: st_accel: Add lis3l02dq support
  iio: adc: add missing of_node references to iio_dev
  iio: adc: ti-ads1015: add indio_dev->dev.of_node reference
  iio: potentiometer: Fix typo in Kconfig
  iio: potentiometer: mcp4531: Add device tree binding
  iio: potentiometer: mcp4531: Add device tree binding documentation
  iio: potentiometer: mcp4531: Add support for MCP454x, MCP456x, MCP464x and MCP466x
  iio:imu:mpu6050: icm20608 initial support
  iio: adc: max1363: Add device tree binding
  ...
parents 9d0be76f 6c71ee3b

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Aaron Durbin <adurbin@google.com> 
Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>

Adrian Bunk <bunk@stusta.de>

Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>

Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>
@@ -94,6 +95,8 @@ Linas Vepstas <linas@austin.ibm.com> 
Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>

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

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

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Documentation/ABI/testing/configfs-iio

+13 −0
Original line number Diff line number Diff line
@@ -19,3 +19,16 @@ KernelVersion: 4.4 
Description:

		High resolution timers directory. Creating a directory here

		will result in creating a hrtimer trigger in the IIO subsystem.



What:		/config/iio/devices

Date:		April 2016

KernelVersion:	4.7

Description:

		Industrial IO software devices directory.



What:		/config/iio/devices/dummy

Date:		April 2016

KernelVersion:	4.7

Description:

		Dummy IIO devices directory. Creating a directory here will result

		in creating a dummy IIO device in the IIO subystem.

Documentation/ABI/testing/sysfs-bus-iio

+14 −0
Original line number Diff line number Diff line
@@ -32,6 +32,13 @@ Description: 
		Description of the physical chip / device for device X.

		Typically a part number.



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

KernelVersion:	4.5

Contact:	linux-iio@vger.kernel.org

Description:

		String identifying current posix clock used to timestamp

		buffered samples and events for device X.



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

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

What:		/sys/bus/iio/devices/triggerX/sampling_frequency
@@ -1565,3 +1572,10 @@ Description: 
		* X is in the plane of the propellers, perpendicular to Y axis,

		  and positive towards the starboard side of the UAV ;

		* Z is perpendicular to propellers plane and positive upwards.



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

KernelVersion:	4.8

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no offset etc.) electric conductivity reading that

		can be processed to siemens per meter.

Documentation/ABI/testing/sysfs-bus-iio-health-afe440x

+25 −38
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/tia_resistanceY

		/sys/bus/iio/devices/iio:deviceX/tia_capacitanceY

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the resistance and the capacitance settings for the

		Transimpedance Amplifier. Y is 1 for Rf1 and Cf1, Y is 2 for

		Rf2 and Cf2 values.



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

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Enable or disable separate settings for the TransImpedance

		Amplifier above, when disabled both values are set by the

		first channel.



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

		/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_ambient_raw

Date:		December 2015

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

Date:		May 2016

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get measured values from the ADC for these stages. Y is the

		specific LED number. The values are expressed in 24-bit twos

		complement.

		specific stage number corresponding to datasheet stage names

		as follows:

		1 -> LED2

		2 -> ALED2/LED3

		3 -> LED1

		4 -> ALED1/LED4

		Note that channels 5 and 6 represent LED2-ALED2 and LED1-ALED1

		respectively which simply helper channels containing the

		calculated difference in the value of stage 1 - 2 and 3 - 4.

		The values are expressed in 24-bit twos complement.



What:		/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw

Date:		December 2015

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

Date:		May 2016

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get differential values from the ADC for these stages. Y is the

		specific LED number. The values are expressed in 24-bit twos

		complement for the specified LEDs.

		Get and set the offset cancellation DAC setting for these

		stages. The values are expressed in 5-bit sign-magnitude.



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

		/sys/bus/iio/devices/iio:deviceX/out_current_ledY_ambient_offset

Date:		December 2015

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

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

Date:		May 2016

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the offset cancellation DAC setting for these

		stages. The values are expressed in 5-bit sign-magnitude.

		Get and set the resistance and the capacitance settings for the

		Transimpedance Amplifier during the associated stage.



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

Date:		December 2015

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

Date:		May 2016

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the LED current for the specified LED. Y is the

		specific LED number.
 
		Get and set the LED current for the specified LED active during

		this stage. Y is the specific stage number.

Documentation/DocBook/iio.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ 


    irqreturn_t sensor_iio_pollfunc(int irq, void *p)

    {

        pf->timestamp = iio_get_time_ns();

        pf->timestamp = iio_get_time_ns((struct indio_dev *)p);

        return IRQ_WAKE_THREAD;

    }