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

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

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

Pull staging and IIO driver fixes from Greg KH:
 "Here's some staging and IIO driver fixes for 4.2-rc3.

  Nothing major, the majority are IIO issues that were reported, with a
  few other minor staging driver fixes.  All have been in linux-next for
  a while with no reported issues"

* tag 'staging-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (25 commits)
  staging: vt6656: check ieee80211_bss_conf bssid not NULL
  staging: vt6655: check ieee80211_bss_conf bssid not NULL
  staging:lustre: remove irq.h from socklnd.h
  staging: make board support depend on OF_IRQ and CLKDEV_LOOKUP
  iio: tmp006: Check channel info on write
  iio: sx9500: Add missing init in sx9500_buffer_pre{en,dis}able()
  iio:light:ltr501: fix regmap dependency
  iio:light:ltr501: fix variable in ltr501_init
  iio: sx9500: fix bug in compensation code
  iio: sx9500: rework error handling of raw readings
  iio: magnetometer: mmc35240: fix available sampling frequencies
  iio:light:stk3310: Fix REGMAP_I2C dependency
  iio: light: STK3310: un-invert proximity values
  iio:adc:cc10001_adc: fix Kconfig dependency
  iio: light: tcs3414: Fix bug preventing to set integration time
  iio:accel:bmc150-accel: fix counting direction
  iio:light:cm3323: clear bitmask before set
  iio: adc: at91_adc: allow to use full range of startup time
  iio: DAC: ad5624r_spi: fix bit shift of output data value
  iio: proximity: sx9500: Fix proximity value
  ...
parents 2b3eb6e3 d309509f

Documentation/ABI/testing/sysfs-bus-iio

+2 −4
Original line number Diff line number Diff line
@@ -1234,10 +1234,8 @@ Description: 
		object is near the sensor, usually be observing

		reflectivity of infrared or ultrasound emitted.

		Often these sensors are unit less and as such conversion

		to SI units is not possible.  Where it is, the units should

		be meters.  If such a conversion is not possible, the reported

		values should behave in the same way as a distance, i.e. lower

		values indicate something is closer to the sensor.

		to SI units is not possible. Higher proximity measurements

		indicate closer objects, and vice versa.



What:		/sys/.../iio:deviceX/in_illuminance_input

What:		/sys/.../iio:deviceX/in_illuminance_raw

drivers/iio/accel/bmc150-accel.c

+1 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ static void bmc150_accel_unregister_triggers(struct bmc150_accel_data *data, 
{

	int i;



	for (i = from; i >= 0; i++) {

	for (i = from; i >= 0; i--) {

		if (data->triggers[i].indio_trig) {

			iio_trigger_unregister(data->triggers[i].indio_trig);

			data->triggers[i].indio_trig = NULL;

drivers/iio/adc/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -153,8 +153,7 @@ config DA9150_GPADC 


config CC10001_ADC

	tristate "Cosmic Circuits 10001 ADC driver"

	depends on HAVE_CLK || REGULATOR

	depends on HAS_IOMEM

	depends on HAS_IOMEM && HAVE_CLK && REGULATOR

	select IIO_BUFFER

	select IIO_TRIGGERED_BUFFER

	help

drivers/iio/adc/at91_adc.c

+4 −4
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ struct at91_adc_caps { 
	u8	ts_pen_detect_sensitivity;



	/* startup time calculate function */

	u32 (*calc_startup_ticks)(u8 startup_time, u32 adc_clk_khz);

	u32 (*calc_startup_ticks)(u32 startup_time, u32 adc_clk_khz);



	u8	num_channels;

	struct at91_adc_reg_desc registers;
@@ -201,7 +201,7 @@ struct at91_adc_state { 
	u8			num_channels;

	void __iomem		*reg_base;

	struct at91_adc_reg_desc *registers;

	u8			startup_time;

	u32			startup_time;

	u8			sample_hold_time;

	bool			sleep_mode;

	struct iio_trigger	**trig;
@@ -779,7 +779,7 @@ static int at91_adc_of_get_resolution(struct at91_adc_state *st, 
	return ret;

}



static u32 calc_startup_ticks_9260(u8 startup_time, u32 adc_clk_khz)

static u32 calc_startup_ticks_9260(u32 startup_time, u32 adc_clk_khz)

{

	/*

	 * Number of ticks needed to cover the startup time of the ADC
@@ -790,7 +790,7 @@ static u32 calc_startup_ticks_9260(u8 startup_time, u32 adc_clk_khz) 
	return round_up((startup_time * adc_clk_khz / 1000) - 1, 8) / 8;

}



static u32 calc_startup_ticks_9x5(u8 startup_time, u32 adc_clk_khz)

static u32 calc_startup_ticks_9x5(u32 startup_time, u32 adc_clk_khz)

{

	/*

	 * For sama5d3x and at91sam9x5, the formula changes to:

drivers/iio/adc/rockchip_saradc.c

+4 −0
Original line number Diff line number Diff line
@@ -349,3 +349,7 @@ static struct platform_driver rockchip_saradc_driver = { 
};



module_platform_driver(rockchip_saradc_driver);



MODULE_AUTHOR("Heiko Stuebner <heiko@sntech.de>");

MODULE_DESCRIPTION("Rockchip SARADC driver");

MODULE_LICENSE("GPL v2");