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

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

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

Jonathan writes:

First set of new drivers and cleanups for IIO in the 3.15 cycle.

New drivers:
* si7005 relative humidity and temperature sensor
* Lite-on ltr501 ambient light and proximity sensor

Cleanups
* Clean up some dead comments in max1363
* Drop some obsolete variables in adjd_s311 and tcs3472 left over from
  the introduction of iio_push_to_buffers_with_timestamp.
* Drop some unneeded linux/init.h includes
* Squish a sparse warning in mpl3115 by correctly specifying a be32 variable.
* A number of cleanups and fixes for sca3000
* Drop an unneed checks in mxs-lradc, ad7303 and adis16400.
* Drop a platform_set_drvdata in viperboard after the only use of it was
  removed during a devm conversion.
* Add a missing device name for ak8975 to comply with the ABI.
* Put mpu6050 into the IMU menu as it slipped out into the main menu.
* Fix a typo and some comment formatting in mpu6050.
* Document at91 ADC clock properties.
parents 81291dd9 7da773e6

Documentation/devicetree/bindings/arm/atmel-adc.txt

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ Required properties: 
    <chip> can be "at91sam9260", "at91sam9g45" or "at91sam9x5"

  - reg: Should contain ADC registers location and length

  - interrupts: Should contain the IRQ line for the ADC

  - clock-names: tuple listing input clock names.

	Required elements: "adc_clk", "adc_op_clk".

  - clocks: phandles to input clocks.

  - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this

    device

  - atmel,adc-startup-time: Startup Time of the ADC in microseconds as
@@ -44,6 +47,8 @@ adc0: adc@fffb0000 { 
	compatible = "atmel,at91sam9260-adc";

	reg = <0xfffb0000 0x100>;

	interrupts = <20 4>;

	clocks = <&adc_clk>, <&adc_op_clk>;

	clock-names = "adc_clk", "adc_op_clk";

	atmel,adc-channel-base = <0x30>;

	atmel,adc-channels-used = <0xff>;

	atmel,adc-drdy-mask = <0x10000>;

drivers/iio/adc/max1363.c

+2 −8
Original line number Diff line number Diff line
@@ -8,17 +8,11 @@ 
  * based on linux/drivers/acron/char/pcf8583.c

  * Copyright (C) 2000 Russell King

  *

  * Driver for max1363 and similar chips.

  *

  * This program is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License version 2 as

  * published by the Free Software Foundation.

  *

  * max1363.c

  *

  * Partial support for max1363 and similar chips.

  *

  * Not currently implemented.

  *

  * - Control of internal reference.

  */



#include <linux/interrupt.h>

drivers/iio/adc/ti_am335x_adc.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 * GNU General Public License for more details.

 */



#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/err.h>

#include <linux/module.h>

drivers/iio/adc/twl6030-gpadc.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
 * 02110-1301 USA

 *

 */

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/module.h>

drivers/iio/adc/viperboard_adc.c

+0 −2
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ static int vprbrd_adc_probe(struct platform_device *pdev) 
		return ret;

	}



	platform_set_drvdata(pdev, indio_dev);



	return 0;

}