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

Commit edf5e794 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-for-4.12c' of... 

Merge tag 'iio-for-4.12c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Third set of new device support, cleanups and features for IIO in the 4.12 cycle

Somewhat dominated in patch numbers of last of the outreachy application
window related patches (they are still coming, despite window being closed
which is good to see!)

Good set of new drivers as well.

New device support
* ASPEED ADC
  - new driver
* cpcap PMIC ADC
  - new driver
* hid-humidity
  - driver for HID compatible humidity sensors.
* ltc2497 ADC
  - new driver
* mpu6050
  - bring bindings up to date and add trivial support for 9250
* rockchip-saradc
  - update bindings to cover rk3328
* vl6180 light, proximity and time of flight sensor.
  - new driver

Features
* meson-saradc
  - add calibration

Cleanup and minor fixes
* ad5504
  - constify attribute_group structure
  - drop casting of void *
* ad7150
  - replace some shifts of 1 by BIT macro usage
* ad7152
  - blank lines between function definitions
* ad7280a
  - octal permissions.
* ad7606
  - replace use of core mlock mutex with a local lock
* ad7746
  - replace some shifts of 1 by BIT macro usage
  - function parameter alignment
  - drop some excessive brackets (introduced in last pull request)
* ad7753
  - white space cleanup
* ad7754
  - includes in alphabetical order and groupped appropriately.
  - change from missuse of internal mlock mutex to using the buffer lock to
  also protect values during frequency update.
* ad779x
  - constify attribute_group structures
* ad9832
  - octal permissions
* adis16060
  - remove use of core mlock mutex in favour of adding a local
  _spi_write_then_read which can use the local buffer protection lock.
  - fix naming of above function.
* adis16203
  - remove locking during reads of calibbias that doesn't protect anything
  not protected elsewhere.
* adis16209
  - remove unnecessary braces in single statement if
* adis16240
  - remove unnecessary braces in single statement if
* adt7136
  - drop excess blank lines and put some in between functions.
* ams-iaq
  - replace comma with semi colon. Not actual bug, just unusual syntax.
* apds9960
  - constify attribute group structure
* as3935
  - constify attribute group structure
* bm1750
  - constify attribute group structure
* cros_ec
  - devm version of triggered buffer setup to simplify code.
* exynos
  - drop casting of void *
* hdc100x
  - constify attribute_group structure
* hid-accel
  - fix wrong scale for newly introduced gravity sensor.
* hts221
  - drop casting of void *
* hx711
  - constify attribute_group structure
* imx7d_adc
  - drop casting of void *
* lm35333
  - constify attribute_group structure
* lsm6dsx
  - drop casting of void *
  - hold ODR configuration until enabling to avoid a race condition.
* max1027
  - drop casting of void *
* max11100
  - fix a comma where semicolon was intended (no actual bug, just odd)
* max1363
  - constify attribute_group structure
* ms sensors
  - drop casting of void *
* rockchip_saradc
  - drop casting of void *
* sun4i-gpadc
  - fix missing dependency on THERMAL or presence of stubs (issue only
  introduced in pervious set)
  - drop casting of void *
* tsl2x7x
  - fix wrong standard deviation calc.  Note these aren't actually used for
  anything at the moment so bug didn't really matter.
  - constify attribute group structure.
* vf610adc
  - drop casting of void *
* vz89x
  - replace comma with semicolon. Not actual bug, just odd syntax.
* zpa2326
  - drop casting of void *
parents a2e99e97 2ccc1503

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

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Aspeed ADC



This device is a 10-bit converter for 16 voltage channels.  All inputs are

single ended.



Required properties:

- compatible: Should be "aspeed,ast2400-adc" or "aspeed,ast2500-adc"

- reg: memory window mapping address and length

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

          SoC's APB clock.

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

                     by index.



Example:

	adc@1e6e9000 {

		compatible = "aspeed,ast2400-adc";

		reg = <0x1e6e9000 0xb0>;

		clocks = <&clk_apb>;

		#io-channel-cells = <1>;

	};

Documentation/devicetree/bindings/iio/adc/cpcap-adc.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Motorola CPCAP PMIC ADC binding



Required properties:

- compatible: Should be "motorola,cpcap-adc" or "motorola,mapphone-cpcap-adc"

- interrupt-parent: The interrupt controller

- interrupts: The interrupt number for the ADC device

- interrupt-names: Should be "adcdone"

- #io-channel-cells: Number of cells in an IIO specifier



Example:



cpcap_adc: adc {

	compatible = "motorola,mapphone-cpcap-adc";

	interrupt-parent = <&cpcap>;

	interrupts = <8 IRQ_TYPE_NONE>;

	interrupt-names = "adcdone";

	#io-channel-cells = <1>;

};

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

0 → 100644
+13 −0
Original line number Diff line number Diff line 
* Linear Technology / Analog Devices LTC2497 ADC



Required properties:

 - compatible: Must be "lltc,ltc2497"

 - reg: Must contain the ADC I2C address

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



Example:

	ltc2497: adc@76 {

		compatible = "lltc,ltc2497";

		reg = <0x76>;

		vref-supply = <&ltc2497_reg>;

	};

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

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
- compatible: should be "rockchip,<name>-saradc" or "rockchip,rk3066-tsadc"

   - "rockchip,saradc": for rk3188, rk3288

   - "rockchip,rk3066-tsadc": for rk3036

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

   - "rockchip,rk3399-saradc": for rk3399



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

Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt

+25 −2
Original line number Diff line number Diff line
@@ -3,14 +3,21 @@ InvenSense MPU-6050 Six-Axis (Gyro + Accelerometer) MEMS MotionTracking Device 
http://www.invensense.com/mems/gyro/mpu6050.html



Required properties:

 - compatible : should be "invensense,mpu6050"

 - compatible : should be one of

		"invensense,mpu6050"

 		"invensense,mpu6500"

		"invensense,mpu9150"

		"invensense,mpu9250"

		"invensense,icm20608"

 - reg : the I2C address of the sensor

 - interrupt-parent : should be the phandle for the interrupt controller

 - interrupts : interrupt mapping for GPIO IRQ



Optional properties:

 - mount-matrix: an optional 3x3 mounting rotation matrix



 - i2c-gate node.  These devices also support an auxiliary i2c bus.  This is

   simple enough to be described using the i2c-gate binding. See

   i2c/i2c-gate.txt for more details.



Example:

	mpu6050@68 {
@@ -28,3 +35,19 @@ Example: 
		               "0",                   /* y2 */

		               "0.984807753012208";   /* z2 */

	};





	mpu9250@68 {

		compatible = "invensense,mpu9250";

		reg = <0x68>;

		interrupt-parent = <&gpio3>;

		interrupts = <21 1>;

		i2c-gate {

			#address-cells = <1>;

			#size-cells = <0>;

			ax8975@c {

				compatible = "ak,ak8975";

				reg = <0x0c>;

			};

		};

	};