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

Commit bf1d6b2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Lots of staging driver fixes and cleanups, including some reorginizing
  of the lustre header files to try to impose some sanity on what is,
  and what is not, the uapi for that filesystem.

  There are some tty core changes in here as well, as the speakup
  drivers need them, and that's ok with me, they are sane and the
  speakup code is getting nicer because of it.

  There is also the addition of the obiligatory new wifi driver, just
  because it has been a release or two since we added our last one...

  Other than that, lots and lots of small coding style fixes, as usual.

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

* tag 'staging-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (612 commits)
  staging:rtl8188eu:core Fix remove unneccessary else block
  staging: typec: fusb302: make structure fusb302_psy_desc static
  staging: unisys: visorbus: make two functions static
  staging: fsl-dpaa2/eth: fix off-by-one FD ctrl bitmaks
  staging: r8822be: Simplify deinit_priv()
  staging: r8822be: Remove some dead code
  staging: vboxvideo: Use CONFIG_DRM_KMS_FB_HELPER to check for fbdefio availability
  staging:rtl8188eu Fix comparison to NULL
  staging: rts5208: rename mmc_ddr_tunning_rx_cmd to mmc_ddr_tuning_rx_cmd
  Staging: Pi433: style fix - tabs and spaces
  staging: pi433: fix spelling mistake: "preample" -> "preamble"
  staging:rtl8188eu:core Fix Code Indent
  staging: typec: fusb302: Export current-limit through a power_supply class dev
  staging: typec: fusb302: Add support for USB2 charger detection through extcon
  staging: typec: fusb302: Use client->irq as irq if set
  staging: typec: fusb302: Get max snk mv/ma/mw from device-properties
  staging: typec: fusb302: Set max supply voltage to 5V
  staging: typec: tcpm: Add get_current_limit tcpc_dev callback
  staging:rtl8188eu Use __func__ instead of function name
  staging: lustre: coding style fixes found by checkpatch.pl
  ...
parents e63a94f1 28eb51f7

Documentation/ABI/testing/sysfs-bus-iio

+9 −0
Original line number Diff line number Diff line
@@ -119,6 +119,15 @@ Description: 
		unique to allow association with event codes. Units after

		application of scale and offset are milliamps.



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

KernelVersion:	4.5

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no bias removal etc.) power measurement from

		channel Y. The number must always be specified and

		unique to allow association with event codes. Units after

		application of scale and offset are milliwatts.



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

KernelVersion:	3.2

Contact:	linux-iio@vger.kernel.org

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

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ Required properties: 
  - atmel,min-sample-rate-hz: Minimum sampling rate, it depends on SoC.

  - atmel,max-sample-rate-hz: Maximum sampling rate, it depends on SoC.

  - atmel,startup-time-ms: Startup time expressed in ms, it depends on SoC.

  - atmel,trigger-edge-type: One of possible edge types for the ADTRG hardware

  trigger pin. When the specific edge type is detected, the conversion will

  start. Possible values are rising, falling, or both.

  This property uses the IRQ edge types values: IRQ_TYPE_EDGE_RISING ,

  IRQ_TYPE_EDGE_FALLING or IRQ_TYPE_EDGE_BOTH



Example:
@@ -25,4 +30,5 @@ adc: adc@fc030000 { 
	atmel,startup-time-ms = <4>;

	vddana-supply = <&vdd_3v3_lp_reg>;

	vref-supply = <&vdd_3v3_lp_reg>;

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

}

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

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ for the Thermal Controller which holds a phandle to the AUXADC. 
Required properties:

  - compatible: Should be one of:

    - "mediatek,mt2701-auxadc": For MT2701 family of SoCs

    - "mediatek,mt7622-auxadc": For MT7622 family of SoCs

    - "mediatek,mt8173-auxadc": For MT8173 family of SoCs

  - reg: Address range of the AUXADC unit.

  - clocks: Should contain a clock specifier for each entry in clock-names

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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
   - "rockchip,rk3066-tsadc": for rk3036

   - "rockchip,rk3328-saradc", "rockchip,rk3399-saradc": for rk3328

   - "rockchip,rk3399-saradc": for rk3399

   - "rockchip,rv1108-saradc", "rockchip,rk3399-saradc": for rv1108



- reg: physical base address of the controller and length of memory mapped

       region.

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

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ Optional properties: 
  * can be 6, 8, 10 or 12 on stm32f4

  * can be 8, 10, 12, 14 or 16 on stm32h7

  Default is maximum resolution if unset.

- st,min-sample-time-nsecs: Minimum sampling time in nanoseconds.

  Depending on hardware (board) e.g. high/low analog input source impedance,

  fine tune of ADC sampling time may be recommended.

  This can be either one value or an array that matches 'st,adc-channels' list,

  to set sample time resp. for all channels, or independently for each channel.



Example:

	adc: adc@40012000 {