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

Merge tag 'iio-for-3.14a' of... 

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

Jonathan writes:

First set of new features, drivers and cleanups for IIO in the 3.14 cycle.
This mostly consists of patches that didn't quite make the last cycle. Lots
of interesting things under review currently.

Core:
- Add devm_iio_device_register/unregister.  I took some convincing on whether
  there would be many devices that really were simple enough to need no
  explicit actions on removal.  Turns out there are some.
- Move some stray docs to above the relevant implemenation.
- Drop a redundant repeated check on the fact the trigger has actually changed
  when there is a userspace attempt change it.

Drivers:
New drivers
- Freescale MPL3115A2 Pressure / temperature sensor

New functionality
- hid_sensors: add sensitivity support.

DT bindings
- tsl2563
- hmc5843

Cleanups
- Drop unused scan_type from viperboard adc driver.
- devm_iio_device_register used in viperboard, ad5421, ad5755, adis16130,
  adxrs450, vcnl4000, adis16220, ad7816, lpc32xx, adt7316, adis16060, isl29018
  and ad2s1200.  Note that this was proposed in a number of other drivers
  and this revealed a number of missorderings in remove functions.  Also for
  now I have blocked this on any device that any hardware suspend suport on
  the basis that we probably want to power down devices if they have no driver
  support loaded.
parents fa590c22 794a870e

Documentation/devicetree/bindings/iio/light/tsl2563.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* AMS TAOS TSL2563 ambient light sensor



Required properties:



  - compatible : should be "amstaos,tsl2563"

  - reg : the I2C address of the sensor



Optional properties:



  - amstaos,cover-comp-gain : integer used as multiplier for gain

                              compensation (default = 1)



Example:



tsl2563@29 {

	compatible = "amstaos,tsl2563";

	reg = <0x29>;

	amstaos,cover-comp-gain = <16>;

};

Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Honeywell HMC5843 magnetometer sensor



Required properties:



  - compatible : should be "honeywell,hmc5843"

  - reg : the I2C address of the magnetometer - typically 0x1e



Optional properties:



  - gpios : should be device tree identifier of the magnetometer DRDY pin



Example:



hmc5843@1e {

        compatible = "honeywell,hmc5843"

        reg = <0x1e>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ aeroflexgaisler Aeroflex Gaisler AB 
ak	Asahi Kasei Corp.

altr	Altera Corp.

amcc	Applied Micro Circuits Corporation (APM, formally AMCC)

amstaos	AMS-Taos Inc.

apm	Applied Micro Circuits Corporation (APM)

arm	ARM Ltd.

atmel	Atmel Corporation

Documentation/driver-model/devres.txt

+2 −0
Original line number Diff line number Diff line
@@ -242,6 +242,8 @@ IIO 
  devm_iio_device_free()

  devm_iio_trigger_alloc()

  devm_iio_trigger_free()

  devm_iio_device_register()

  devm_iio_device_unregister()



IO region

  devm_request_region()

drivers/iio/accel/hid-sensor-accel-3d.c

+12 −0
Original line number Diff line number Diff line
@@ -262,6 +262,18 @@ static int accel_3d_parse_report(struct platform_device *pdev, 
			st->accel[1].index, st->accel[1].report_id,

			st->accel[2].index, st->accel[2].report_id);



	/* Set Sensitivity field ids, when there is no individual modifier */

	if (st->common_attributes.sensitivity.index < 0) {

		sensor_hub_input_get_attribute_info(hsdev,

			HID_FEATURE_REPORT, usage_id,

			HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS |

			HID_USAGE_SENSOR_DATA_ACCELERATION,

			&st->common_attributes.sensitivity);

		dev_dbg(&pdev->dev, "Sensitivity index:report %d:%d\n",

			st->common_attributes.sensitivity.index,

			st->common_attributes.sensitivity.report_id);

	}



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE