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

Commit 188ce5ab authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next

parents 362b0563 a4881cc4
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Uwe Kleine-König <ukl@pengutronix.de>
Uwe Kleine-König <ukl@pengutronix.de>
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
Yusuke Goda <goda.yusuke@renesas.com>
Yusuke Goda <goda.yusuke@renesas.com>
Gustavo Padovan <gustavo@las.ic.unicamp.br>
Gustavo Padovan <gustavo@las.ic.unicamp.br>
+15 −0
Original line number Original line Diff line number Diff line
What:		/sys/bus/w1/devices/.../pio
Date:		May 2012
Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>
Description:	read/write the contents of the two PIO's of the DS28E04-100
		see Documentation/w1/slaves/w1_ds28e04 for detailed information
Users:		any user space application which wants to communicate with DS28E04-100



What:		/sys/bus/w1/devices/.../eeprom
Date:		May 2012
Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>
Description:	read/write the contents of the EEPROM memory of the DS28E04-100
		see Documentation/w1/slaves/w1_ds28e04 for detailed information
Users:		any user space application which wants to communicate with DS28E04-100
+20 −9
Original line number Original line Diff line number Diff line
@@ -58,16 +58,18 @@ Description: The /dev/kmsg character device node provides userspace access


		The output format consists of a prefix carrying the syslog
		The output format consists of a prefix carrying the syslog
		prefix including priority and facility, the 64 bit message
		prefix including priority and facility, the 64 bit message
		sequence number and the monotonic timestamp in microseconds.
		sequence number and the monotonic timestamp in microseconds,
		The values are separated by a ','. Future extensions might
		and a flag field. All fields are separated by a ','.
		add more comma separated values before the terminating ';'.

		Unknown values should be gracefully ignored.
		Future extensions might add more comma separated values before
		the terminating ';'. Unknown fields and values should be
		gracefully ignored.


		The human readable text string starts directly after the ';'
		The human readable text string starts directly after the ';'
		and is terminated by a '\n'. Untrusted values derived from
		and is terminated by a '\n'. Untrusted values derived from
		hardware or other facilities are printed, therefore
		hardware or other facilities are printed, therefore
		all non-printable characters in the log message are escaped
		all non-printable characters and '\' itself in the log message
		by "\x00" C-style hex encoding.
		are escaped by "\x00" C-style hex encoding.


		A line starting with ' ', is a continuation line, adding
		A line starting with ' ', is a continuation line, adding
		key/value pairs to the log message, which provide the machine
		key/value pairs to the log message, which provide the machine
@@ -75,11 +77,11 @@ Description: The /dev/kmsg character device node provides userspace access
		userspace.
		userspace.


		Example:
		Example:
		7,160,424069;pci_root PNP0A03:00: host bridge window [io  0x0000-0x0cf7] (ignored)
		7,160,424069,-;pci_root PNP0A03:00: host bridge window [io  0x0000-0x0cf7] (ignored)
		 SUBSYSTEM=acpi
		 SUBSYSTEM=acpi
		 DEVICE=+acpi:PNP0A03:00
		 DEVICE=+acpi:PNP0A03:00
		6,339,5140900;NET: Registered protocol family 10
		6,339,5140900,-;NET: Registered protocol family 10
		30,340,5690716;udevd[80]: starting version 181
		30,340,5690716,-;udevd[80]: starting version 181


		The DEVICE= key uniquely identifies devices the following way:
		The DEVICE= key uniquely identifies devices the following way:
		  b12:8        - block dev_t
		  b12:8        - block dev_t
@@ -87,4 +89,13 @@ Description: The /dev/kmsg character device node provides userspace access
		  n8           - netdev ifindex
		  n8           - netdev ifindex
		  +sound:card0 - subsystem:devname
		  +sound:card0 - subsystem:devname


		The flags field carries '-' by default. A 'c' indicates a
		fragment of a line. All following fragments are flagged with
		'+'. Note, that these hints about continuation lines are not
		neccessarily correct, and the stream could be interleaved with
		unrelated messages, but merging the lines in the output
		usually produces better human readable results. A similar
		logic is used internally when messages are printed to the
		console, /proc/kmsg or the syslog() syscall.

Users:		dmesg(1), userspace kernel log consumers
Users:		dmesg(1), userspace kernel log consumers
+0 −21
Original line number Original line Diff line number Diff line
What:           /sys/block/rssd*/registers
Date:           March 2012
KernelVersion:  3.3
Contact:        Asai Thambi S P <asamymuthupa@micron.com>
Description:    This is a read-only file. Dumps below driver information and
                hardware registers.
                    - S ACTive
                    - Command Issue
                    - Completed
                    - PORT IRQ STAT
                    - HOST IRQ STAT
                    - Allocated
                    - Commands in Q

What:           /sys/block/rssd*/status
What:           /sys/block/rssd*/status
Date:           April 2012
Date:           April 2012
KernelVersion:  3.4
KernelVersion:  3.4
Contact:        Asai Thambi S P <asamymuthupa@micron.com>
Contact:        Asai Thambi S P <asamymuthupa@micron.com>
Description:    This is a read-only file. Indicates the status of the device.
Description:    This is a read-only file. Indicates the status of the device.

What:           /sys/block/rssd*/flags
Date:           May 2012
KernelVersion:  3.5
Contact:        Asai Thambi S P <asamymuthupa@micron.com>
Description:    This is a read-only file. Dumps the flags in port and driver
                data structure
+59 −26
Original line number Original line Diff line number Diff line
@@ -40,9 +40,9 @@ Contact: linux-iio@vger.kernel.org
Description:
Description:
		Some devices have internal clocks.  This parameter sets the
		Some devices have internal clocks.  This parameter sets the
		resulting sampling frequency.  In many devices this
		resulting sampling frequency.  In many devices this
		parameter has an effect on input filters etc rather than
		parameter has an effect on input filters etc. rather than
		simply controlling when the input is sampled.  As this
		simply controlling when the input is sampled.  As this
		effects datardy triggers, hardware buffers and the sysfs
		effects data ready triggers, hardware buffers and the sysfs
		direct access interfaces, it may be found in any of the
		direct access interfaces, it may be found in any of the
		relevant directories.  If it effects all of the above
		relevant directories.  If it effects all of the above
		then it is to be found in the base device directory.
		then it is to be found in the base device directory.
@@ -74,7 +74,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_raw
KernelVersion:	2.6.35
KernelVersion:	2.6.35
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		Raw (unscaled no bias removal etc) voltage measurement from
		Raw (unscaled no bias removal etc.) voltage measurement from
		channel Y. In special cases where the channel does not
		channel Y. In special cases where the channel does not
		correspond to externally available input one of the named
		correspond to externally available input one of the named
		versions may be used. The number must always be specified and
		versions may be used. The number must always be specified and
@@ -118,11 +118,11 @@ What: /sys/bus/iio/devices/iio:deviceX/in_temp_z_raw
KernelVersion:	2.6.35
KernelVersion:	2.6.35
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		Raw (unscaled no bias removal etc) temperature measurement.
		Raw (unscaled no bias removal etc.) temperature measurement.
		If an axis is specified it generally means that the temperature
		If an axis is specified it generally means that the temperature
		sensor is associated with one part of a compound device (e.g.
		sensor is associated with one part of a compound device (e.g.
		a gyroscope axis). Units after application of scale and offset
		a gyroscope axis). Units after application of scale and offset
		are milli degrees Celsuis.
		are milli degrees Celsius.


What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_input
What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_input
KernelVersion:	2.6.38
KernelVersion:	2.6.38
@@ -148,10 +148,9 @@ KernelVersion: 2.6.35
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		Angular velocity about axis x, y or z (may be arbitrarily
		Angular velocity about axis x, y or z (may be arbitrarily
		assigned) Data converted by application of offset then scale to
		assigned). Has all the equivalent parameters as	per voltageY.
		radians per second. Has all the equivalent parameters as
		Units after application of scale and offset are	radians per
		per voltageY. Units after application of scale and offset are
		second.
		radians per second.


What:		/sys/bus/iio/devices/iio:deviceX/in_incli_x_raw
What:		/sys/bus/iio/devices/iio:deviceX/in_incli_x_raw
What:		/sys/bus/iio/devices/iio:deviceX/in_incli_y_raw
What:		/sys/bus/iio/devices/iio:deviceX/in_incli_y_raw
@@ -161,7 +160,7 @@ Contact: linux-iio@vger.kernel.org
Description:
Description:
		Inclination raw reading about axis x, y or z (may be
		Inclination raw reading about axis x, y or z (may be
		arbitrarily assigned). Data converted by application of offset
		arbitrarily assigned). Data converted by application of offset
		and scale to Degrees.
		and scale to degrees.


What:		/sys/bus/iio/devices/iio:deviceX/in_magn_x_raw
What:		/sys/bus/iio/devices/iio:deviceX/in_magn_x_raw
What:		/sys/bus/iio/devices/iio:deviceX/in_magn_y_raw
What:		/sys/bus/iio/devices/iio:deviceX/in_magn_y_raw
@@ -203,7 +202,7 @@ Contact: linux-iio@vger.kernel.org
Description:
Description:
		If known for a device, offset to be added to <type>[Y]_raw prior
		If known for a device, offset to be added to <type>[Y]_raw prior
		to scaling by <type>[Y]_scale in order to obtain value in the
		to scaling by <type>[Y]_scale in order to obtain value in the
		<type> units as specified in <type>[y]_raw documentation.
		<type> units as specified in <type>[Y]_raw documentation.
		Not present if the offset is always 0 or unknown. If Y or
		Not present if the offset is always 0 or unknown. If Y or
		axis <x|y|z> is not present, then the offset applies to all
		axis <x|y|z> is not present, then the offset applies to all
		in channels of <type>.
		in channels of <type>.
@@ -219,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_voltageY_supply_scale
What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_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_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_scale
What:		/sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
What:		/sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
@@ -248,7 +248,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias
KernelVersion:	2.6.35
KernelVersion:	2.6.35
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		Hardware applied calibration offset. (assumed to fix production
		Hardware applied calibration offset (assumed to fix production
		inaccuracies).
		inaccuracies).


What		/sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
What		/sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
@@ -265,7 +265,7 @@ what /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
KernelVersion:	2.6.35
KernelVersion:	2.6.35
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		Hardware applied calibration scale factor. (assumed to fix
		Hardware applied calibration scale factor (assumed to fix
		production inaccuracies).  If shared across all channels,
		production inaccuracies).  If shared across all channels,
		<type>_calibscale is used.
		<type>_calibscale is used.


@@ -273,11 +273,12 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available
What:		/sys/.../iio:deviceX/in_voltageX_scale_available
What:		/sys/.../iio:deviceX/in_voltageX_scale_available
What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available
What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available
What:		/sys/.../iio:deviceX/out_voltageX_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
What:		/sys/.../iio:deviceX/in_capacitance_scale_available
KernelVersion:	2.635
KernelVersion:	2.6.35
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		If a discrete set of scale values are available, they
		If a discrete set of scale values is available, they
		are listed in this attribute.
		are listed in this attribute.


What		/sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
What		/sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
@@ -298,14 +299,19 @@ Description:
		gives the 3dB frequency of the filter in Hz.
		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_voltageY_raw
What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw
KernelVersion:	2.6.37
KernelVersion:	2.6.37
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		Raw (unscaled, no bias etc.) output voltage for
		Raw (unscaled, no bias etc.) output voltage for
		channel Y.  The number must always be specified and
		channel Y.  The number must always be specified and
		unique if the output corresponds to a single channel.
		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_voltageY&Z_raw
What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw
KernelVersion:	2.6.37
KernelVersion:	2.6.37
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
@@ -316,20 +322,26 @@ Description:


What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode
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_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
KernelVersion:	2.6.38
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		Specifies the output powerdown mode.
		Specifies the output powerdown mode.
		DAC output stage is disconnected from the amplifier and
		DAC output stage is disconnected from the amplifier and
		1kohm_to_gnd: connected to ground via an 1kOhm resistor
		1kohm_to_gnd: connected	to ground via an 1kOhm resistor,
		100kohm_to_gnd: connected to ground via an 100kOhm resistor
		6kohm_to_gnd: connected to ground via a 6kOhm resistor,
		three_state: left floating
		20kohm_to_gnd: connected to ground via a 20kOhm resistor,
		100kohm_to_gnd: connected to ground via an 100kOhm resistor,
		three_state: left floating.
		For a list of available output power down options read
		For a list of available output power down options read
		outX_powerdown_mode_available. If Y is not present the
		outX_powerdown_mode_available. If Y is not present the
		mode is shared across all outputs.
		mode is shared across all outputs.


What:		/sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
What:		/sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
What:		/sys/.../iio:deviceX/out_voltage_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
KernelVersion:	2.6.38
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
@@ -338,13 +350,34 @@ Description:


What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown
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_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
KernelVersion:	2.6.38
Contact:	linux-iio@vger.kernel.org
Contact:	linux-iio@vger.kernel.org
Description:
Description:
		Writing 1 causes output Y to enter the power down mode specified
		Writing 1 causes output Y to enter the power down mode specified
		by the corresponding outY_powerdown_mode. Clearing returns to
		by the corresponding outY_powerdown_mode. DAC output stage is
		normal operation. Y may be suppressed if all outputs are
		disconnected from the amplifier. Clearing returns to normal
		controlled together.
		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
What:		/sys/bus/iio/devices/iio:deviceX/events
KernelVersion:	2.6.35
KernelVersion:	2.6.35
@@ -390,12 +423,12 @@ Description:
		different values, but the device can only enable both thresholds
		different values, but the device can only enable both thresholds
		or neither.
		or neither.
		Note the driver will assume the last p events requested are
		Note the driver will assume the last p events requested are
		to be enabled where p is however many it supports (which may
		to be enabled where p is how many it supports (which may vary
		vary depending on the exact set requested. So if you want to be
		depending on the exact set requested. So if you want to be
		sure you have set what you think you have, check the contents of
		sure you have set what you think you have, check the contents of
		these attributes after everything is configured. Drivers may
		these attributes after everything is configured. Drivers may
		have to buffer any parameters so that they are consistent when
		have to buffer any parameters so that they are consistent when
		a given event type is enabled a future point (and not those for
		a given event type is enabled at a future point (and not those for
		whatever event was previously enabled).
		whatever event was previously enabled).


What:		/sys/.../iio:deviceX/events/in_accel_x_roc_rising_en
What:		/sys/.../iio:deviceX/events/in_accel_x_roc_rising_en
@@ -671,7 +704,7 @@ What: /sys/.../buffer/scan_elements/in_anglvel_type
What:		/sys/.../buffer/scan_elements/in_magn_type
What:		/sys/.../buffer/scan_elements/in_magn_type
What:		/sys/.../buffer/scan_elements/in_incli_type
What:		/sys/.../buffer/scan_elements/in_incli_type
What:		/sys/.../buffer/scan_elements/in_voltageY_type
What:		/sys/.../buffer/scan_elements/in_voltageY_type
What:		/sys/.../buffer/scan_elements/in_voltage-in_type
What:		/sys/.../buffer/scan_elements/in_voltage_type
What:		/sys/.../buffer/scan_elements/in_voltageY_supply_type
What:		/sys/.../buffer/scan_elements/in_voltageY_supply_type
What:		/sys/.../buffer/scan_elements/in_timestamp_type
What:		/sys/.../buffer/scan_elements/in_timestamp_type
KernelVersion:	2.6.37
KernelVersion:	2.6.37
@@ -692,7 +725,7 @@ Description:
		the buffer output value appropriately.  The storagebits value
		the buffer output value appropriately.  The storagebits value
		also specifies the data alignment.  So s48/64>>2 will be a
		also specifies the data alignment.  So s48/64>>2 will be a
		signed 48 bit integer stored in a 64 bit location aligned to
		signed 48 bit integer stored in a 64 bit location aligned to
		a a64 bit boundary. To obtain the clean value, shift right 2
		a 64 bit boundary. To obtain the clean value, shift right 2
		and apply a mask to zero the top 16 bits of the result.
		and apply a mask to zero the top 16 bits of the result.
		For other storage combinations this attribute will be extended
		For other storage combinations this attribute will be extended
		appropriately.
		appropriately.
Loading