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

Commit 018c81b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging/IIO driver fixes from Greg KH:
 "Here are a number of small fixes for staging and IIO drivers that
  resolve reported problems.

  Full details are in the shortlog.  All of these have been in
  linux-next with no reported issues"

* tag 'staging-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (35 commits)
  arm: dts: rockchip: add reset node for the exist saradc SoCs
  arm64: dts: rockchip: add reset saradc node for rk3368 SoCs
  iio: adc: rockchip_saradc: reset saradc controller before programming it
  iio: accel: kxsd9: Fix raw read return
  iio: adc: ti_am335x_adc: Increase timeout value waiting for ADC sample
  iio: adc: ti_am335x_adc: Protect FIFO1 from concurrent access
  include/linux: fix excess fence.h kernel-doc notation
  staging: wilc1000: correctly check if associatedsta has not been found
  staging: wilc1000: NULL dereference on error
  staging: wilc1000: txq_event: Fix coding error
  MAINTAINERS: Add file patterns for ion device tree bindings
  MAINTAINERS: Update maintainer entry for wilc1000
  iio: chemical: atlas-ph-sensor: fix typo in val assignment
  iio: fix sched WARNING "do not call blocking ops when !TASK_RUNNING"
  staging: comedi: ni_mio_common: fix AO inttrig backwards compatibility
  staging: comedi: dt2811: fix a precedence bug
  staging: comedi: adv_pci1760: Do not return EINVAL for CMDF_ROUND_DOWN.
  staging: comedi: ni_mio_common: fix wrong insn_write handler
  staging: comedi: comedi_test: fix timer race conditions
  staging: comedi: daqboard2000: bug fix board type matching code
  ...
parents 39da979c eafe5cfe

Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ Required properties: 
- vref-supply: The regulator supply ADC reference voltage.

- #io-channel-cells: Should be 1, see ../iio-bindings.txt



Optional properties:

- resets: Must contain an entry for each entry in reset-names if need support

	  this option. See ../reset/reset.txt for details.

- reset-names: Must include the name "saradc-apb".



Example:

	saradc: saradc@2006c000 {

		compatible = "rockchip,saradc";
@@ -23,6 +28,8 @@ Example: 
		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;

		clock-names = "saradc", "apb_pclk";

		resets = <&cru SRST_SARADC>;

		reset-names = "saradc-apb";

		#io-channel-cells = <1>;

		vref-supply = <&vcc18>;

	};

MAINTAINERS

+3 −6
Original line number Diff line number Diff line
@@ -798,6 +798,7 @@ M: Laura Abbott <labbott@redhat.com> 
M:	Sumit Semwal <sumit.semwal@linaro.org>

L:	devel@driverdev.osuosl.org

S:	Supported

F:	Documentation/devicetree/bindings/staging/ion/

F:	drivers/staging/android/ion

F:	drivers/staging/android/uapi/ion.h

F:	drivers/staging/android/uapi/ion_test.h
@@ -11232,12 +11233,8 @@ S: Odd Fixes 
F:	drivers/staging/vt665?/



STAGING - WILC1000 WIFI DRIVER

M:	Johnny Kim <johnny.kim@atmel.com>

M:	Austin Shin <austin.shin@atmel.com>

M:	Chris Park <chris.park@atmel.com>

M:	Tony Cho <tony.cho@atmel.com>

M:	Glen Lee <glen.lee@atmel.com>

M:	Leo Kim <leo.kim@atmel.com>

M:	Aditya Shankar <aditya.shankar@microchip.com>

M:	Ganesh Krishna <ganesh.krishna@microchip.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/staging/wilc1000/

arch/arm/boot/dts/rk3066a.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ 
		clock-names = "saradc", "apb_pclk";

		interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;

		#io-channel-cells = <1>;

		resets = <&cru SRST_SARADC>;

		reset-names = "saradc-apb";

		status = "disabled";

	};

arch/arm/boot/dts/rk3288.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ 
		#io-channel-cells = <1>;

		clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;

		clock-names = "saradc", "apb_pclk";

		resets = <&cru SRST_SARADC>;

		reset-names = "saradc-apb";

		status = "disabled";

	};

arch/arm/boot/dts/rk3xxx.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -399,6 +399,8 @@ 
		#io-channel-cells = <1>;

		clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;

		clock-names = "saradc", "apb_pclk";

		resets = <&cru SRST_SARADC>;

		reset-names = "saradc-apb";

		status = "disabled";

	};