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

Merge branch 'staging-linus' into staging-next 



We need this for the pstore fixes that went into the staging-linus branch, so
that things apply properly for the pstore/android code merge.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 71f882fe 364ed2f4

Documentation/ABI/testing/sysfs-bus-iio

+31 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_scale 
What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_scale

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_scale

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
@@ -272,6 +273,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available 
What:		/sys/.../iio:deviceX/in_voltageX_scale_available

What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available

What:		/sys/.../iio:deviceX/out_voltageX_scale_available

What:		/sys/.../iio:deviceX/out_altvoltageX_scale_available

What:		/sys/.../iio:deviceX/in_capacitance_scale_available

KernelVersion:	2.635

Contact:	linux-iio@vger.kernel.org
@@ -297,14 +299,19 @@ Description: 
		gives the 3dB frequency of the filter in Hz.



What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_raw

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled, no bias etc.) output voltage for

		channel Y.  The number must always be specified and

		unique if the output corresponds to a single channel.

		While DAC like devices typically use out_voltage,

		a continuous frequency generating device, such as

		a DDS or PLL should use out_altvoltage.



What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -315,6 +322,8 @@ Description: 


What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Description:
@@ -331,6 +340,8 @@ Description: 


What:		/sys/.../iio:deviceX/out_votlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_voltage_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Description:
@@ -339,6 +350,8 @@ Description: 


What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Description:
@@ -348,6 +361,24 @@ Description: 
		operation. Y may be suppressed if all outputs are controlled

		together.



What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Output frequency for channel Y in Hz. The number must always be

		specified and unique if the output corresponds to a single

		channel.



What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Phase in radians of one frequency/clock output Y

		(out_altvoltageY) relative to another frequency/clock output

		(out_altvoltageZ) of the device X. The number must always be

		specified and unique if the output corresponds to a single

		channel.



What:		/sys/bus/iio/devices/iio:deviceX/events

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

drivers/iio/industrialio-core.c

+9 −7
Original line number Diff line number Diff line
@@ -724,7 +724,6 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev) 
	 * New channel registration method - relies on the fact a group does

	 * not need to be initialized if it is name is NULL.

	 */

	INIT_LIST_HEAD(&indio_dev->channel_attr_list);

	if (indio_dev->channels)

		for (i = 0; i < indio_dev->num_channels; i++) {

			ret = iio_device_add_channel_sysfs(indio_dev,
@@ -788,12 +787,16 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev) 
static void iio_dev_release(struct device *device)

{

	struct iio_dev *indio_dev = dev_to_iio_dev(device);

	if (indio_dev->chrdev.dev)

		cdev_del(&indio_dev->chrdev);

	if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)

		iio_device_unregister_trigger_consumer(indio_dev);

	iio_device_unregister_eventset(indio_dev);

	iio_device_unregister_sysfs(indio_dev);

	iio_device_unregister_debugfs(indio_dev);



	ida_simple_remove(&iio_ida, indio_dev->id);

	kfree(indio_dev);

}



static struct device_type iio_dev_type = {
@@ -824,6 +827,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv) 
		dev_set_drvdata(&dev->dev, (void *)dev);

		mutex_init(&dev->mlock);

		mutex_init(&dev->info_exist_lock);

		INIT_LIST_HEAD(&dev->channel_attr_list);



		dev->id = ida_simple_get(&iio_ida, 0, 0, GFP_KERNEL);

		if (dev->id < 0) {
@@ -841,10 +845,8 @@ EXPORT_SYMBOL(iio_device_alloc); 


void iio_device_free(struct iio_dev *dev)

{

	if (dev) {

		ida_simple_remove(&iio_ida, dev->id);

		kfree(dev);

	}

	if (dev)

		put_device(&dev->dev);

}

EXPORT_SYMBOL(iio_device_free);
@@ -965,7 +967,7 @@ void iio_device_unregister(struct iio_dev *indio_dev) 
	mutex_lock(&indio_dev->info_exist_lock);

	indio_dev->info = NULL;

	mutex_unlock(&indio_dev->info_exist_lock);

	device_unregister(&indio_dev->dev);

	device_del(&indio_dev->dev);

}

EXPORT_SYMBOL(iio_device_unregister);

subsys_initcall(iio_init);

drivers/staging/comedi/drivers.c

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/pci.h>

#include <linux/usb.h>

#include <linux/errno.h>

#include <linux/kconfig.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/fcntl.h>
@@ -1030,6 +1031,8 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver, 
}

EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister);



#if IS_ENABLED(CONFIG_USB)



static int comedi_old_usb_auto_config(struct usb_interface *intf,

				      struct comedi_driver *driver)

{
@@ -1092,3 +1095,5 @@ void comedi_usb_driver_unregister(struct comedi_driver *comedi_driver, 
	comedi_driver_unregister(comedi_driver);

}

EXPORT_SYMBOL_GPL(comedi_usb_driver_unregister);



#endif

drivers/staging/iio/Documentation/device.txt

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ Then fill in the following: 
	* info->driver_module:

		Set to THIS_MODULE. Used to ensure correct ownership

		of various resources allocate by the core.

	* info->num_interrupt_lines:

		Number of event triggering hardware lines the device has.

	* info->event_attrs:

		Attributes used to enable / disable hardware events.

	* info->attrs:

drivers/staging/iio/adc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config AD7291 
config AD7298

	tristate "Analog Devices AD7298 ADC driver"

	depends on SPI

	select IIO_KFIFO_BUF if IIO_BUFFER

	help

	  Say yes here to build support for Analog Devices AD7298

	  8 Channel ADC with temperature sensor.