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

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

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

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

  It is a lot, over 500 changes, but not huge by previous kernel release
  standards. We deleted more lines than we added again (27k added vs.
  91k remvoed), thanks to finally being able to delete the IRDA drivers
  and networking code.

  We also deleted the ccree crypto driver, but that's coming back in
  through the crypto tree to you, in a much cleaned-up form.

  Added this round is at lot of "mt7621" device support, which is for an
  embedded device that Neil Brown cares about, and of course a handful
  of new IIO drivers as well.

  And finally, the fsl-mc core code moved out of the staging tree to the
  "real" part of the kernel, which is nice to see happen as well.

  Full details are in the shortlog, which has all of the tiny cleanup
  patches described.

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

* tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (579 commits)
  staging: rtl8723bs: Remove yield call, replace with cond_resched()
  staging: rtl8723bs: Replace yield() call with cond_resched()
  staging: rtl8723bs: Remove unecessary newlines from 'odm.h'.
  staging: rtl8723bs: Rework 'struct _ODM_Phy_Status_Info_' coding style.
  staging: rtl8723bs: Rework 'struct _ODM_Per_Pkt_Info_' coding style.
  staging: rtl8723bs: Replace NULL pointer comparison with '!'.
  staging: rtl8723bs: Factor out rtl8723bs_recv_tasklet() sections.
  staging: rtl8723bs: Fix function signature that goes over 80 characters.
  staging: rtl8723bs: Fix lines too long in update_recvframe_attrib().
  staging: rtl8723bs: Remove unnecessary blank lines in 'rtl8723bs_recv.c'.
  staging: rtl8723bs: Change camel case to snake case in 'rtl8723bs_recv.c'.
  staging: rtl8723bs: Add missing braces in else statement.
  staging: rtl8723bs: Add spaces around ternary operators.
  staging: rtl8723bs: Fix lines with trailing open parentheses.
  staging: rtl8723bs: Remove unnecessary length #define's.
  staging: rtl8723bs: Fix IEEE80211 authentication algorithm constants.
  staging: rtl8723bs: Fix alignment in rtw_wx_set_auth().
  staging: rtl8723bs: Remove braces from single statement conditionals.
  staging: rtl8723bs: Remove unecessary braces from switch statement.
  staging: rtl8723bs: Fix newlines in rtw_wx_set_auth().
  ...
parents 9abf8ace 049b5e2a

Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x

+1 −1
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw

Date:		September 2015

KernelVersion:	4.3

Contact:	Matt Ranostay <mranostay@gmail.com>

Contact:	Matt Ranostay <matt.ranostay@konsulko.com>

Description:

		Get the raw calibration VOC value from the sensor.

		This value has little application outside of calibration.

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+2 −2
Original line number Diff line number Diff line 
What		/sys/bus/iio/devices/iio:deviceX/in_proximity_input

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Contact:	Matt Ranostay <matt.ranostay@konsulko.com>

Description:

		Get the current distance in meters of storm (1km steps)

		1000-40000 = distance in meters
@@ -9,7 +9,7 @@ Description: 
What		/sys/bus/iio/devices/iio:deviceX/sensor_sensitivity

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Contact:	Matt Ranostay <matt.ranostay@konsulko.com>

Description:

		Show or set the gain boost of the amp, from 0-31 range.

		18 = indoors (default)

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

0 → 100644
+48 −0
Original line number Diff line number Diff line 
* X-Powers AXP ADC bindings



Required properties:

  - compatible: should be one of:

    - "x-powers,axp209-adc",

    - "x-powers,axp221-adc",

    - "x-powers,axp813-adc",

  - #io-channel-cells: should be 1,



Example:



&axp22x {

	adc {

		compatible = "x-powers,axp221-adc";

		#io-channel-cells = <1>;

	};

};



ADC channels and their indexes per variant:



AXP209

------

 0 | acin_v

 1 | acin_i

 2 | vbus_v

 3 | vbus_i

 4 | pmic_temp

 5 | gpio0_v

 6 | gpio1_v

 7 | ipsout_v

 8 | batt_v

 9 | batt_chrg_i

10 | batt_dischrg_i



AXP22x

------

 0 | pmic_temp

 1 | batt_v

 2 | batt_chrg_i

 3 | batt_dischrg_i



AXP813

------

 0 | pmic_temp

 1 | gpio0_v

 2 | batt_v

 3 | batt_chrg_i

 4 | batt_dischrg_i

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

+6 −2
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ Optional properties: 
		  to "clock" property. Frequency must be a multiple of the rcc

		  clock frequency. If not, SPI CLKOUT frequency will not be

		  accurate.

- pinctrl-names:	Set to "default".

- pinctrl-0:		List of phandles pointing to pin configuration

			nodes to set pins in mode of operation for dfsdm

			on external pin.



Contents of a STM32 DFSDM child nodes:

--------------------------------------
@@ -68,8 +72,8 @@ Optional properties: 
- st,adc-channel-types:	Single-ended channel input type.

			- "SPI_R": SPI with data on rising edge (default)

			- "SPI_F": SPI with data on falling edge

			- "MANCH_R": manchester codec, rising edge = logic 0

			- "MANCH_F": manchester codec, falling edge = logic 1

			- "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1

			- "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0

- st,adc-channel-clk-src: Conversion clock source.

			  - "CLKIN": external SPI clock (CLKIN x)

			  - "CLKOUT": internal SPI clock (CLKOUT) (default)

Documentation/devicetree/bindings/iio/potentiometer/ad5272.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* Analog Devices AD5272 digital potentiometer



The node for this device must be a child node of a I2C controller, hence

all mandatory properties for your controller must be specified. See directory:



        Documentation/devicetree/bindings/i2c



for more details.



Required properties:

	- compatible:  	Must be one of the following, depending on the model:

			adi,ad5272-020

			adi,ad5272-050

			adi,ad5272-100

			adi,ad5274-020

			adi,ad5274-100



Optional properties:

 - reset-gpios: GPIO specification for the RESET input. This is an

		active low signal to the AD5272.



Example:

ad5272: potentiometer@2f {

	reg = <0x2F>;

	compatible = "adi,ad5272-020";

	reset-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>;

};