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

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

Merge tag 'iio-fixes-for-4.0b' of... 

Merge tag 'iio-fixes-for-4.0b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

Second round of IIO fixes for the 4.0 cycle (or round one part two really!)
These are fixes for patches in the recent merge window and are in a separate
branch to avoid rebasing the main fixes-togreg branch.

* jsa1212 - select missing REGMAP_I2C
* ssp_common - build warning fix for PM functions when PM not in use.
* ak8975 - the addition of a utility library for this driver (as part of
           adding new device support) led to a dependency not being inforced
	   for the original driver (I2C and GPIOLIB).
parents d582cb79 36086889

drivers/iio/common/ssp_sensors/ssp_dev.c

+2 −0
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ static int ssp_remove(struct spi_device *spi) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int ssp_suspend(struct device *dev)

{

	int ret;
@@ -688,6 +689,7 @@ static int ssp_resume(struct device *dev) 


	return 0;

}

#endif /* CONFIG_PM_SLEEP */



static const struct dev_pm_ops ssp_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(ssp_suspend, ssp_resume)

drivers/iio/light/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ config HID_SENSOR_PROX 
config JSA1212

	tristate "JSA1212 ALS and proximity sensor driver"

	depends on I2C

	select REGMAP_I2C

	help

	 Say Y here if you want to build a IIO driver for JSA1212

	 proximity & ALS sensor device.

drivers/iio/magnetometer/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ config AK8975 


config AK09911

	tristate "Asahi Kasei AK09911 3-axis Compass"

	depends on I2C

	depends on GPIOLIB

	select AK8975

	help

	  Deprecated: AK09911 is now supported by AK8975 driver.