forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next' (accumulated 3.16 merge window patches) into master
Now that 3.15 is released, this merges the 'next' branch into 'master', bringing us to the normal situation where my 'master' branch is the merge window. * accumulated work in next: (6809 commits) ufs: sb mutex merge + mutex_destroy powerpc: update comments for generic idle conversion cris: update comments for generic idle conversion idle: remove cpu_idle() forward declarations nbd: zero from and len fields in NBD_CMD_DISCONNECT. mm: convert some level-less printks to pr_* MAINTAINERS: adi-buildroot-devel is moderated MAINTAINERS: add linux-api for review of API/ABI changes mm/kmemleak-test.c: use pr_fmt for logging fs/dlm/debug_fs.c: replace seq_printf by seq_puts fs/dlm/lockspace.c: convert simple_str to kstr fs/dlm/config.c: convert simple_str to kstr mm: mark remap_file_pages() syscall as deprecated mm: memcontrol: remove unnecessary memcg argument from soft limit functions mm: memcontrol: clean up memcg zoneinfo lookup mm/memblock.c: call kmemleak directly from memblock_(alloc|free) mm/mempool.c: update the kmemleak stack trace for mempool allocations lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations mm: introduce kmemleak_update_trace() mm/kmemleak.c: use %u to print ->checksum ...
- Loading branch information
Showing
5,560 changed files
with
308,529 additions
and
157,791 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,14 +114,17 @@ What: /sys/bus/iio/devices/iio:deviceX/in_temp_raw | |
| What: /sys/bus/iio/devices/iio:deviceX/in_tempX_raw | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_temp_x_raw | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_temp_y_raw | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_temp_z_raw | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_temp_ambient_raw | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_temp_object_raw | ||
| KernelVersion: 2.6.35 | ||
| Contact: [email protected] | ||
| Description: | ||
| Raw (unscaled no bias removal etc.) temperature measurement. | ||
| If an axis is specified it generally means that the temperature | ||
| 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). The ambient and object modifiers distinguish | ||
| between ambient (reference) and distant temperature for contact- | ||
| less measurements. Units after application of scale and offset | ||
| are milli degrees Celsius. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_tempX_input | ||
|
|
@@ -210,6 +213,14 @@ Contact: [email protected] | |
| Description: | ||
| Scaled humidity measurement in milli percent. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_X_mean_raw | ||
| KernelVersion: 3.5 | ||
| Contact: [email protected] | ||
| Description: | ||
| Averaged raw measurement from channel X. The number of values | ||
| used for averaging is device specific. The converting rules for | ||
| normal raw values also applies to the averaged raw values. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_accel_offset | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_offset | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_offset | ||
|
|
@@ -784,6 +795,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_incli_x_en | |
| What: /sys/.../iio:deviceX/scan_elements/in_incli_y_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_pressureY_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_pressure_en | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en | ||
| KernelVersion: 2.6.37 | ||
| Contact: [email protected] | ||
| Description: | ||
|
|
@@ -799,6 +811,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type | |
| What: /sys/.../iio:deviceX/scan_elements/in_timestamp_type | ||
| What: /sys/.../iio:deviceX/scan_elements/in_pressureY_type | ||
| What: /sys/.../iio:deviceX/scan_elements/in_pressure_type | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type | ||
| KernelVersion: 2.6.37 | ||
| Contact: [email protected] | ||
| Description: | ||
|
|
@@ -845,6 +858,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_incli_y_index | |
| What: /sys/.../iio:deviceX/scan_elements/in_timestamp_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_pressureY_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_pressure_index | ||
| What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index | ||
| KernelVersion: 2.6.37 | ||
| Contact: [email protected] | ||
| Description: | ||
|
|
@@ -881,6 +895,25 @@ Description: | |
| on-chip EEPROM. After power-up or chip reset the device will | ||
| automatically load the saved configuration. | ||
|
|
||
| What: /sys/.../iio:deviceX/in_illuminanceY_input | ||
| What: /sys/.../iio:deviceX/in_illuminanceY_raw | ||
| What: /sys/.../iio:deviceX/in_illuminanceY_mean_raw | ||
| KernelVersion: 3.4 | ||
| Contact: [email protected] | ||
| Description: | ||
| Illuminance measurement, units after application of scale | ||
| and offset are lux. | ||
|
|
||
| What: /sys/.../iio:deviceX/in_intensityY_raw | ||
| What: /sys/.../iio:deviceX/in_intensityY_ir_raw | ||
| What: /sys/.../iio:deviceX/in_intensityY_both_raw | ||
| KernelVersion: 3.4 | ||
| Contact: [email protected] | ||
| Description: | ||
| Unit-less light intensity. Modifiers both and ir indicate | ||
| that measurements contains visible and infrared light | ||
| components or just infrared light, respectively. | ||
|
|
||
| What: /sys/.../iio:deviceX/in_intensity_red_integration_time | ||
| What: /sys/.../iio:deviceX/in_intensity_green_integration_time | ||
| What: /sys/.../iio:deviceX/in_intensity_blue_integration_time | ||
|
|
@@ -891,3 +924,12 @@ Contact: [email protected] | |
| Description: | ||
| This attribute is used to get/set the integration time in | ||
| seconds. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_rot_quaternion_raw | ||
| KernelVersion: 3.15 | ||
| Contact: [email protected] | ||
| Description: | ||
| Raw value of quaternion components using a format | ||
| x y z w. Here x, y, and z component represents the axis about | ||
| which a rotation will occur and w component represents the | ||
| amount of rotation. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| What /sys/bus/iio/devices/iio:deviceX/in_proximity_raw | ||
| Date: March 2014 | ||
| KernelVersion: 3.15 | ||
| Contact: Matt Ranostay <[email protected]> | ||
| Description: | ||
| Get the current distance in meters of storm (1km steps) | ||
| 1000-40000 = distance in meters | ||
|
|
||
| What /sys/bus/iio/devices/iio:deviceX/sensor_sensitivity | ||
| Date: March 2014 | ||
| KernelVersion: 3.15 | ||
| Contact: Matt Ranostay <[email protected]> | ||
| Description: | ||
| Show or set the gain boost of the amp, from 0-31 range. | ||
| 18 = indoors (default) | ||
| 14 = outdoors |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -250,3 +250,24 @@ Description: | |
| valid. For example, writing a 2 to this file when sriov_numvfs | ||
| is not 0 and not 2 already will return an error. Writing a 10 | ||
| when the value of sriov_totalvfs is 8 will return an error. | ||
|
|
||
| What: /sys/bus/pci/devices/.../driver_override | ||
| Date: April 2014 | ||
| Contact: Alex Williamson <[email protected]> | ||
| Description: | ||
| This file allows the driver for a device to be specified which | ||
| will override standard static and dynamic ID matching. When | ||
| specified, only a driver with a name matching the value written | ||
| to driver_override will have an opportunity to bind to the | ||
| device. The override is specified by writing a string to the | ||
| driver_override file (echo pci-stub > driver_override) and | ||
| may be cleared with an empty string (echo > driver_override). | ||
| This returns the device to standard matching rules binding. | ||
| Writing to driver_override does not automatically unbind the | ||
| device from its current driver or make any attempt to | ||
| automatically load the specified driver. If no driver with a | ||
| matching name is currently loaded in the kernel, the device | ||
| will not bind to any driver. This also allows devices to | ||
| opt-out of driver binding using a driver_override name such as | ||
| "none". Only a single driver may be specified in the override, | ||
| there is no support for parsing delimiters. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| What: /sys/devices/../../gisb_arb_timeout | ||
| Date: May 2014 | ||
| KernelVersion: 3.17 | ||
| Contact: Florian Fainelli <[email protected]> | ||
| Description: | ||
| Returns the currently configured raw timeout value of the | ||
| Broadcom Set Top Box internal GISB bus arbiter. Minimum value | ||
| is 1, and maximum value is 0xffffffff. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req | ||
| Date: Feb 2014 | ||
| Contact: Li Jun <[email protected]> | ||
| Description: | ||
| Can be set and read. | ||
| Set a_bus_req(A-device bus request) input to be 1 if | ||
| the application running on the A-device wants to use the bus, | ||
| and to be 0 when the application no longer wants to use | ||
| the bus(or wants to work as peripheral). a_bus_req can also | ||
| be set to 1 by kernel in response to remote wakeup signaling | ||
| from the B-device, the A-device should decide to resume the bus. | ||
|
|
||
| Valid values are "1" and "0". | ||
|
|
||
| Reading: returns 1 if the application running on the A-device | ||
| is using the bus as host role, otherwise 0. | ||
|
|
||
| What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop | ||
| Date: Feb 2014 | ||
| Contact: Li Jun <[email protected]> | ||
| Description: | ||
| Can be set and read | ||
| The a_bus_drop(A-device bus drop) input is 1 when the | ||
| application running on the A-device wants to power down | ||
| the bus, and is 0 otherwise, When a_bus_drop is 1, then | ||
| the a_bus_req shall be 0. | ||
|
|
||
| Valid values are "1" and "0". | ||
|
|
||
| Reading: returns 1 if the bus is off(vbus is turned off) by | ||
| A-device, otherwise 0. | ||
|
|
||
| What: /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req | ||
| Date: Feb 2014 | ||
| Contact: Li Jun <[email protected]> | ||
| Description: | ||
| Can be set and read. | ||
| The b_bus_req(B-device bus request) input is 1 during the time | ||
| that the application running on the B-device wants to use the | ||
| bus as host, and is 0 when the application no longer wants to | ||
| work as host and decides to switch back to be peripheral. | ||
|
|
||
| Valid values are "1" and "0". | ||
|
|
||
| Reading: returns if the application running on the B device | ||
| is using the bus as host role, otherwise 0. | ||
|
|
||
| What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_clr_err | ||
| Date: Feb 2014 | ||
| Contact: Li Jun <[email protected]> | ||
| Description: | ||
| Only can be set. | ||
| The a_clr_err(A-device Vbus error clear) input is used to clear | ||
| vbus error, then A-device will power down the bus. | ||
|
|
||
| Valid value is "1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,19 +7,30 @@ Description: | |
| subsystem. | ||
|
|
||
| What: /sys/power/state | ||
| Date: August 2006 | ||
| Date: May 2014 | ||
| Contact: Rafael J. Wysocki <[email protected]> | ||
| Description: | ||
| The /sys/power/state file controls the system power state. | ||
| Reading from this file returns what states are supported, | ||
| which is hard-coded to 'freeze' (Low-Power Idle), 'standby' | ||
| (Power-On Suspend), 'mem' (Suspend-to-RAM), and 'disk' | ||
| (Suspend-to-Disk). | ||
| The /sys/power/state file controls system sleep states. | ||
| Reading from this file returns the available sleep state | ||
| labels, which may be "mem", "standby", "freeze" and "disk" | ||
| (hibernation). The meanings of the first three labels depend on | ||
| the relative_sleep_states command line argument as follows: | ||
| 1) relative_sleep_states = 1 | ||
| "mem", "standby", "freeze" represent non-hibernation sleep | ||
| states from the deepest ("mem", always present) to the | ||
| shallowest ("freeze"). "standby" and "freeze" may or may | ||
| not be present depending on the capabilities of the | ||
| platform. "freeze" can only be present if "standby" is | ||
| present. | ||
| 2) relative_sleep_states = 0 (default) | ||
| "mem" - "suspend-to-RAM", present if supported. | ||
| "standby" - "power-on suspend", present if supported. | ||
| "freeze" - "suspend-to-idle", always present. | ||
|
|
||
| Writing to this file one of these strings causes the system to | ||
| transition into that state. Please see the file | ||
| Documentation/power/states.txt for a description of each of | ||
| these states. | ||
| transition into the corresponding state, if available. See | ||
| Documentation/power/states.txt for a description of what | ||
| "suspend-to-RAM", "power-on suspend" and "suspend-to-idle" mean. | ||
|
|
||
| What: /sys/power/disk | ||
| Date: September 2006 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.