Commit 2f37d65a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver updates from Greg KH:
 "Here is the big staging driver updates for 4.3-rc1.

  Lots of things all over the place, almost all of them trivial fixups
  and changes.  The usual IIO updates and new drivers and we have added
  the MOST driver subsystem which is getting cleaned up in the tree.
  The ozwpan driver is finally being deleted as it is obviously
  abandoned and no one cares about it.

  Full details are in the shortlog, and all of these have been in
  linux-next with no reported issues"

* tag 'staging-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (912 commits)
  staging/lustre/o2iblnd: remove references to ib_reg_phsy_mr()
  staging: wilc1000: fix build warning with setup_timer()
  staging: wilc1000: remove DECLARE_WILC_BUFFER()
  staging: wilc1000: remove void function return statements that are not useful
  staging: wilc1000: coreconfigurator.c: fix kmalloc error check
  staging: wilc1000: coreconfigurator.c: use kmalloc instead of WILC_MALLOC
  staging: wilc1000: remove unused codes of gps8ConfigPacket
  staging: wilc1000: remove unnecessary void pointer cast
  staging: wilc1000: remove WILC_NEW and WILC_NEW_EX
  staging: wilc1000: use kmalloc instead of WILC_NEW
  staging: wilc1000: Process WARN, INFO options of debug levels from user
  staging: wilc1000: remove unneeded tstrWILC_MsgQueueAttrs typedef
  staging: wilc1000: delete wilc_osconfig.h
  staging: wilc1000: delete wilc_log.h
  staging: wilc1000: delete wilc_timer.h
  staging: wilc1000: remove WILC_TimerStart()
  staging: wilc1000: remove WILC_TimerCreate()
  staging: wilc1000: remove WILC_TimerDestroy()
  staging: wilc1000: remove WILC_TimerStop()
  staging: wilc1000: remove tstrWILC_TimerAttrs typedef
  ...
parents 1af115d6 415bcb5c

Documentation/ABI/testing/sysfs-bus-iio

+8 −10
Original line number Diff line number Diff line
@@ -413,6 +413,11 @@ Description: 
		to compute the calories burnt by the user.



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

What:		/sys/.../iio:deviceX/in_anglvel_scale_available

What:		/sys/.../iio:deviceX/in_magn_scale_available

What:		/sys/.../iio:deviceX/in_illuminance_scale_available

What:		/sys/.../iio:deviceX/in_intensity_scale_available

What:		/sys/.../iio:deviceX/in_proximity_scale_available

What:		/sys/.../iio:deviceX/in_voltageX_scale_available

What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available

What:		/sys/.../iio:deviceX/out_voltageX_scale_available
@@ -498,9 +503,9 @@ Description: 
		outX_powerdown_mode_available. If Y is not present the

		mode is shared across all outputs.



What:		/sys/.../iio:deviceX/out_votlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_voltageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_voltage_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvoltageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org
@@ -1035,13 +1040,6 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Number of scans contained by the buffer.



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

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Bytes per scan.  Due to alignment fun, the scan may be larger

		than implied directly by the scan_element parameters.



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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

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

+9 −0
Original line number Diff line number Diff line
@@ -9,3 +9,12 @@ Description: 
		automated testing or in situations, where other trigger methods

		are not applicable. For example no RTC or spare GPIOs.

		X is the IIO index of the trigger.



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

KernelVersion:	2.6.39

Contact:	linux-iio@vger.kernel.org

Description:

		The name attribute holds a description string for the current

		trigger. In order to associate the trigger with an IIO device

		one should write this name string to

		/sys/bus/iio/devices/iio:deviceY/trigger/current_trigger.

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ DOCBOOKS := z8530book.xml device-drivers.xml \ 
	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml drm.xml media_api.xml w1.xml \

	    writing_musb_glue_layer.xml crypto-API.xml

	    writing_musb_glue_layer.xml crypto-API.xml iio.xml



include Documentation/DocBook/media/Makefile

Documentation/DocBook/iio.tmpl

0 → 100644
+697 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/iio/adc/mcp320x.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties: 
				"mcp3202"

				"mcp3204"

				"mcp3208"

				"mcp3301"





Examples:

CRA Git | Maintained and supported by SUSTech CRA and CCSE