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

Commit 5d8515bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  There is the normal amount of new IIO drivers added, like all
  releases.

  The networking IPX and the ncpfs filesystem are moved into the staging
  tree, as they are on their way out of the kernel due to lack of use
  anymore.

  The visorbus subsystem finall has started moving out of the staging
  tree to the "real" part of the kernel, and the most and fsl-mc
  codebases are almost ready to move out, that will probably happen for
  4.17-rc1 if all goes well.

  Other than that, there is a bunch of license header cleanups in the
  tree, along with the normal amount of coding style churn that we all
  know and love for this codebase. I also got frustrated at the
  Meltdown/Spectre mess and took it out on the dgnc tty driver, deleting
  huge chunks of it that were never even being used.

  Full details of everything is in the shortlog.

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

* tag 'staging-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (627 commits)
  staging: rtlwifi: remove redundant initialization of 'cfg_cmd'
  staging: rtl8723bs: remove a couple of redundant initializations
  staging: comedi: reformat lines to 80 chars or less
  staging: lustre: separate a connection destroy from free struct kib_conn
  Staging: rtl8723bs: Use !x instead of NULL comparison
  Staging: rtl8723bs: Remove dead code
  Staging: rtl8723bs: Change names to conform to the kernel code
  staging: ccree: Fix missing blank line after declaration
  staging: rtl8188eu: remove redundant initialization of 'pwrcfgcmd'
  staging: rtlwifi: remove unused RTLHALMAC_ST and RTLPHYDM_ST
  staging: fbtft: remove unused FB_TFT_SSD1325 kconfig
  staging: comedi: dt2811: remove redundant initialization of 'ns'
  staging: wilc1000: fix alignments to match open parenthesis
  staging: wilc1000: removed unnecessary defined enums typedef
  staging: wilc1000: remove unnecessary use of parentheses
  staging: rtl8192u: remove redundant initialization of 'timeout'
  staging: sm750fb: fix CamelCase for dispSet var
  staging: lustre: lnet/selftest: fix compile error on UP build
  staging: rtl8723bs: hal_com_phycfg: Remove unneeded semicolons
  staging: rts5208: Fix "seg_no" calculation in reset_ms_card()
  ...
parents db593322 3384e011

Documentation/ABI/testing/sysfs-bus-iio

+12 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Description: 
		Description of the physical chip / device for device X.

		Typically a part number.



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

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

KernelVersion:	4.5

Contact:	linux-iio@vger.kernel.org

Description:
@@ -1290,7 +1290,7 @@ KernelVersion: 3.4 
Contact:	linux-iio@vger.kernel.org

Description:

		Unit-less light intensity. Modifiers both and ir indicate

		that measurements contains visible and infrared light

		that measurements contain visible and infrared light

		components or just infrared light, respectively. Modifier uv indicates

		that measurements contain ultraviolet light components.
@@ -1413,6 +1413,16 @@ Description: 
		the available samples after the timeout expires and thus have a

		maximum delay guarantee.



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

KernelVersion: 4.16

Contact:	linux-iio@vger.kernel.org

Description:

		A read-only value indicating the bytes of data available in the

		buffer. In the case of an output buffer, this indicates the

		amount of empty space available to write data to. In the case of

		an input buffer, this indicates the amount of data available for

		reading.



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

KernelVersion: 4.2

Contact:	linux-iio@vger.kernel.org

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

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ Required properties: 
			- "clkin" for the reference clock (typically XTAL)

			- "core" for the SAR ADC core clock

		optional clocks:

			- "sana" for the analog clock

			- "adc_clk" for the ADC (sampling) clock

			- "adc_sel" for the ADC (sampling) clock mux

- vref-supply:	the regulator supply for the ADC reference voltage

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

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
- reg: memory window mapping address and length

- clocks: Input clock used to derive the sample clock. Expected to be the

          SoC's APB clock.

- resets: Reset controller phandle

- #io-channel-cells: Must be set to <1> to indicate channels are selected

                     by index.
@@ -15,6 +16,7 @@ Example: 
	adc@1e6e9000 {

		compatible = "aspeed,ast2400-adc";

		reg = <0x1e6e9000 0xb0>;

		clocks = <&clk_apb>;

		clocks = <&syscon ASPEED_CLK_APB>;

		resets = <&syscon ASPEED_RESET_ADC>;

		#io-channel-cells = <1>;

	};

Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ Required properties: 
  This property uses the IRQ edge types values: IRQ_TYPE_EDGE_RISING ,

  IRQ_TYPE_EDGE_FALLING or IRQ_TYPE_EDGE_BOTH



Optional properties:

  - dmas: Phandle to dma channel for the ADC.

  - dma-names: Must be "rx" when dmas property is being used.

  See ../../dma/dma.txt for details.



Example:



adc: adc@fc030000 {
@@ -31,4 +36,6 @@ adc: adc@fc030000 { 
	vddana-supply = <&vdd_3v3_lp_reg>;

	vref-supply = <&vdd_3v3_lp_reg>;

	atmel,trigger-edge-type = <IRQ_TYPE_EDGE_BOTH>;

	dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | AT91_XDMAC_DT_PERID(25))>;

	dma-names = "rx";

}

Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt

+24 −0
Original line number Diff line number Diff line
@@ -62,6 +62,15 @@ Required properties: 
- st,adc-channels: List of single-ended channels muxed for this ADC.

  It can have up to 16 channels on stm32f4 or 20 channels on stm32h7, numbered

  from 0 to 15 or 19 (resp. for in0..in15 or in0..in19).

- st,adc-diff-channels: List of differential channels muxed for this ADC.

  Depending on part used, some channels can be configured as differential

  instead of single-ended (e.g. stm32h7). List here positive and negative

  inputs pairs as <vinp vinn>, <vinp vinn>,... vinp and vinn are numbered

  from 0 to 19 on stm32h7)

  Note: At least one of "st,adc-channels" or "st,adc-diff-channels" is required.

  Both properties can be used together. Some channels can be used as

  single-ended and some other ones as differential (mixed). But channels

  can't be configured both as single-ended and differential (invalid).

- #io-channel-cells = <1>: See the IIO bindings section "IIO consumers" in

  Documentation/devicetree/bindings/iio/iio-bindings.txt
@@ -111,3 +120,18 @@ Example: 
		...

		other adc child nodes follow...

	};



Example to setup:

- channel 1 as single-ended

- channels 2 & 3 as differential (with resp. 6 & 7 negative inputs)



	adc: adc@40022000 {

		compatible = "st,stm32h7-adc-core";

		...

		adc1: adc@0 {

			compatible = "st,stm32h7-adc";

			...

			st,adc-channels = <1>;

			st,adc-diff-channels = <2 6>, <3 7>;

		};

	};