Skip to content

Commit e6c3401

Browse files
dtordtor
committed
Merge tag 'v3.6-rc4' into next
Linux 3.6-rc4 # gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886 # gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"
2 parents a85442a + 4cbe5a5 commit e6c3401

8,203 files changed

Lines changed: 515740 additions & 247542 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
What: /proc/sys/vm/nr_pdflush_threads
2+
Date: June 2012
3+
Contact: Wanpeng Li <liwp@linux.vnet.ibm.com>
4+
Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush
5+
exported in /proc/sys/vm/ should be removed.

‎Documentation/ABI/stable/sysfs-bus-firewire‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@ Users: udev rules to set ownership and access permissions or ACLs of
3939
/dev/fw[0-9]+ character device files
4040

4141

42+
What: /sys/bus/firewire/devices/fw[0-9]+/is_local
43+
Date: July 2012
44+
KernelVersion: 3.6
45+
Contact: linux1394-devel@lists.sourceforge.net
46+
Description:
47+
IEEE 1394 node device attribute.
48+
Read-only and immutable.
49+
Values: 1: The sysfs entry represents a local node (a controller card).
50+
0: The sysfs entry represents a remote node.
51+
52+
4253
What: /sys/bus/firewire/devices/fw[0-9]+[.][0-9]+/
4354
Date: May 2007
4455
KernelVersion: 2.6.22

‎Documentation/ABI/stable/sysfs-driver-w1_ds28e04‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/w1/devices/.../pio
2+
Date: May 2012
3+
Contact: Markus Franke <franm@hrz.tu-chemnitz.de>
4+
Description: read/write the contents of the two PIO's of the DS28E04-100
5+
see Documentation/w1/slaves/w1_ds28e04 for detailed information
6+
Users: any user space application which wants to communicate with DS28E04-100
7+
8+
9+
10+
What: /sys/bus/w1/devices/.../eeprom
11+
Date: May 2012
12+
Contact: Markus Franke <franm@hrz.tu-chemnitz.de>
13+
Description: read/write the contents of the EEPROM memory of the DS28E04-100
14+
see Documentation/w1/slaves/w1_ds28e04 for detailed information
15+
Users: any user space application which wants to communicate with DS28E04-100

‎Documentation/ABI/stable/vdso‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ though.
2424

2525
(As of this writing, this ABI documentation as been confirmed for x86_64.
2626
The maintainers of the other vDSO-using architectures should confirm
27-
that it is correct for their architecture.)
27+
that it is correct for their architecture.)

‎Documentation/ABI/testing/dev-kmsg‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,33 +58,44 @@ Description: The /dev/kmsg character device node provides userspace access
5858

5959
The output format consists of a prefix carrying the syslog
6060
prefix including priority and facility, the 64 bit message
61-
sequence number and the monotonic timestamp in microseconds.
62-
The values are separated by a ','. Future extensions might
63-
add more comma separated values before the terminating ';'.
64-
Unknown values should be gracefully ignored.
61+
sequence number and the monotonic timestamp in microseconds,
62+
and a flag field. All fields are separated by a ','.
63+
64+
Future extensions might add more comma separated values before
65+
the terminating ';'. Unknown fields and values should be
66+
gracefully ignored.
6567

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

7274
A line starting with ' ', is a continuation line, adding
7375
key/value pairs to the log message, which provide the machine
7476
readable context of the message, for reliable processing in
7577
userspace.
7678

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

8486
The DEVICE= key uniquely identifies devices the following way:
8587
b12:8 - block dev_t
8688
c127:3 - char dev_t
8789
n8 - netdev ifindex
8890
+sound:card0 - subsystem:devname
8991

92+
The flags field carries '-' by default. A 'c' indicates a
93+
fragment of a line. All following fragments are flagged with
94+
'+'. Note, that these hints about continuation lines are not
95+
neccessarily correct, and the stream could be interleaved with
96+
unrelated messages, but merging the lines in the output
97+
usually produces better human readable results. A similar
98+
logic is used internally when messages are printed to the
99+
console, /proc/kmsg or the syslog() syscall.
100+
90101
Users: dmesg(1), userspace kernel log consumers

‎Documentation/ABI/testing/sysfs-block-rssd‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
1-
What: /sys/block/rssd*/registers
2-
Date: March 2012
3-
KernelVersion: 3.3
4-
Contact: Asai Thambi S P <asamymuthupa@micron.com>
5-
Description: This is a read-only file. Dumps below driver information and
6-
hardware registers.
7-
- S ACTive
8-
- Command Issue
9-
- Completed
10-
- PORT IRQ STAT
11-
- HOST IRQ STAT
12-
- Allocated
13-
- Commands in Q
14-
151
What: /sys/block/rssd*/status
162
Date: April 2012
173
KernelVersion: 3.4
184
Contact: Asai Thambi S P <asamymuthupa@micron.com>
195
Description: This is a read-only file. Indicates the status of the device.
20-
21-
What: /sys/block/rssd*/flags
22-
Date: May 2012
23-
KernelVersion: 3.5
24-
Contact: Asai Thambi S P <asamymuthupa@micron.com>
25-
Description: This is a read-only file. Dumps the flags in port and driver
26-
data structure

‎Documentation/ABI/testing/sysfs-block-zram‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@ Description:
9696
overhead, allocated for this disk. So, allocator space
9797
efficiency can be calculated using compr_data_size and this
9898
statistic.
99-
Unit: bytes
99+
Unit: bytes

‎Documentation/ABI/testing/sysfs-bus-iio‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Contact: linux-iio@vger.kernel.org
4040
Description:
4141
Some devices have internal clocks. This parameter sets the
4242
resulting sampling frequency. In many devices this
43-
parameter has an effect on input filters etc rather than
43+
parameter has an effect on input filters etc. rather than
4444
simply controlling when the input is sampled. As this
45-
effects datardy triggers, hardware buffers and the sysfs
45+
effects data ready triggers, hardware buffers and the sysfs
4646
direct access interfaces, it may be found in any of the
4747
relevant directories. If it effects all of the above
4848
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
7474
KernelVersion: 2.6.35
7575
Contact: linux-iio@vger.kernel.org
7676
Description:
77-
Raw (unscaled no bias removal etc) voltage measurement from
77+
Raw (unscaled no bias removal etc.) voltage measurement from
7878
channel Y. In special cases where the channel does not
7979
correspond to externally available input one of the named
8080
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
118118
KernelVersion: 2.6.35
119119
Contact: linux-iio@vger.kernel.org
120120
Description:
121-
Raw (unscaled no bias removal etc) temperature measurement.
121+
Raw (unscaled no bias removal etc.) temperature measurement.
122122
If an axis is specified it generally means that the temperature
123123
sensor is associated with one part of a compound device (e.g.
124124
a gyroscope axis). Units after application of scale and offset
125-
are milli degrees Celsuis.
125+
are milli degrees Celsius.
126126

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

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

166165
What: /sys/bus/iio/devices/iio:deviceX/in_magn_x_raw
167166
What: /sys/bus/iio/devices/iio:deviceX/in_magn_y_raw
@@ -203,7 +202,7 @@ Contact: linux-iio@vger.kernel.org
203202
Description:
204203
If known for a device, offset to be added to <type>[Y]_raw prior
205204
to scaling by <type>[Y]_scale in order to obtain value in the
206-
<type> units as specified in <type>[y]_raw documentation.
205+
<type> units as specified in <type>[Y]_raw documentation.
207206
Not present if the offset is always 0 or unknown. If Y or
208207
axis <x|y|z> is not present, then the offset applies to all
209208
in channels of <type>.
@@ -249,7 +248,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias
249248
KernelVersion: 2.6.35
250249
Contact: linux-iio@vger.kernel.org
251250
Description:
252-
Hardware applied calibration offset. (assumed to fix production
251+
Hardware applied calibration offset (assumed to fix production
253252
inaccuracies).
254253

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

@@ -276,10 +275,10 @@ What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available
276275
What: /sys/.../iio:deviceX/out_voltageX_scale_available
277276
What: /sys/.../iio:deviceX/out_altvoltageX_scale_available
278277
What: /sys/.../iio:deviceX/in_capacitance_scale_available
279-
KernelVersion: 2.635
278+
KernelVersion: 2.6.35
280279
Contact: linux-iio@vger.kernel.org
281280
Description:
282-
If a discrete set of scale values are available, they
281+
If a discrete set of scale values is available, they
283282
are listed in this attribute.
284283

285284
What /sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
@@ -330,9 +329,11 @@ Contact: linux-iio@vger.kernel.org
330329
Description:
331330
Specifies the output powerdown mode.
332331
DAC output stage is disconnected from the amplifier and
333-
1kohm_to_gnd: connected to ground via an 1kOhm resistor
334-
100kohm_to_gnd: connected to ground via an 100kOhm resistor
335-
three_state: left floating
332+
1kohm_to_gnd: connected to ground via an 1kOhm resistor,
333+
6kohm_to_gnd: connected to ground via a 6kOhm resistor,
334+
20kohm_to_gnd: connected to ground via a 20kOhm resistor,
335+
100kohm_to_gnd: connected to ground via an 100kOhm resistor,
336+
three_state: left floating.
336337
For a list of available output power down options read
337338
outX_powerdown_mode_available. If Y is not present the
338339
mode is shared across all outputs.
@@ -355,9 +356,10 @@ KernelVersion: 2.6.38
355356
Contact: linux-iio@vger.kernel.org
356357
Description:
357358
Writing 1 causes output Y to enter the power down mode specified
358-
by the corresponding outY_powerdown_mode. Clearing returns to
359-
normal operation. Y may be suppressed if all outputs are
360-
controlled together.
359+
by the corresponding outY_powerdown_mode. DAC output stage is
360+
disconnected from the amplifier. Clearing returns to normal
361+
operation. Y may be suppressed if all outputs are controlled
362+
together.
361363

362364
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency
363365
KernelVersion: 3.4.0
@@ -421,12 +423,12 @@ Description:
421423
different values, but the device can only enable both thresholds
422424
or neither.
423425
Note the driver will assume the last p events requested are
424-
to be enabled where p is however many it supports (which may
425-
vary depending on the exact set requested. So if you want to be
426+
to be enabled where p is how many it supports (which may vary
427+
depending on the exact set requested. So if you want to be
426428
sure you have set what you think you have, check the contents of
427429
these attributes after everything is configured. Drivers may
428430
have to buffer any parameters so that they are consistent when
429-
a given event type is enabled a future point (and not those for
431+
a given event type is enabled at a future point (and not those for
430432
whatever event was previously enabled).
431433

432434
What: /sys/.../iio:deviceX/events/in_accel_x_roc_rising_en
@@ -702,7 +704,7 @@ What: /sys/.../buffer/scan_elements/in_anglvel_type
702704
What: /sys/.../buffer/scan_elements/in_magn_type
703705
What: /sys/.../buffer/scan_elements/in_incli_type
704706
What: /sys/.../buffer/scan_elements/in_voltageY_type
705-
What: /sys/.../buffer/scan_elements/in_voltage-in_type
707+
What: /sys/.../buffer/scan_elements/in_voltage_type
706708
What: /sys/.../buffer/scan_elements/in_voltageY_supply_type
707709
What: /sys/.../buffer/scan_elements/in_timestamp_type
708710
KernelVersion: 2.6.37
@@ -723,7 +725,7 @@ Description:
723725
the buffer output value appropriately. The storagebits value
724726
also specifies the data alignment. So s48/64>>2 will be a
725727
signed 48 bit integer stored in a 64 bit location aligned to
726-
a a64 bit boundary. To obtain the clean value, shift right 2
728+
a 64 bit boundary. To obtain the clean value, shift right 2
727729
and apply a mask to zero the top 16 bits of the result.
728730
For other storage combinations this attribute will be extended
729731
appropriately.

‎Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/pll2_feedback_clk_present
2+
What: /sys/bus/iio/devices/iio:deviceX/pll2_reference_clk_present
3+
What: /sys/bus/iio/devices/iio:deviceX/pll1_reference_clk_a_present
4+
What: /sys/bus/iio/devices/iio:deviceX/pll1_reference_clk_b_present
5+
What: /sys/bus/iio/devices/iio:deviceX/pll1_reference_clk_test_present
6+
What: /sys/bus/iio/devices/iio:deviceX/vcxo_clk_present
7+
KernelVersion: 3.4.0
8+
Contact: linux-iio@vger.kernel.org
9+
Description:
10+
Reading returns either '1' or '0'.
11+
'1' means that the clock in question is present.
12+
'0' means that the clock is missing.
13+
14+
What: /sys/bus/iio/devices/iio:deviceX/pllY_locked
15+
KernelVersion: 3.4.0
16+
Contact: linux-iio@vger.kernel.org
17+
Description:
18+
Reading returns either '1' or '0'. '1' means that the
19+
pllY is locked.
20+
21+
What: /sys/bus/iio/devices/iio:deviceX/store_eeprom
22+
KernelVersion: 3.4.0
23+
Contact: linux-iio@vger.kernel.org
24+
Description:
25+
Writing '1' stores the current device configuration into
26+
on-chip EEPROM. After power-up or chip reset the device will
27+
automatically load the saved configuration.
28+
29+
What: /sys/bus/iio/devices/iio:deviceX/sync_dividers
30+
KernelVersion: 3.4.0
31+
Contact: linux-iio@vger.kernel.org
32+
Description:
33+
Writing '1' triggers the clock distribution synchronization
34+
functionality. All dividers are reset and the channels start
35+
with their predefined phase offsets (out_altvoltageY_phase).
36+
Writing this file has the effect as driving the external
37+
/SYNC pin low.

‎Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency_resolution
2+
KernelVersion: 3.4.0
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
Stores channel Y frequency resolution/channel spacing in Hz.
6+
The value given directly influences the MODULUS used by
7+
the fractional-N PLL. It is assumed that the algorithm
8+
that is used to compute the various dividers, is able to
9+
generate proper values for multiples of channel spacing.
10+
11+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_refin_frequency
12+
KernelVersion: 3.4.0
13+
Contact: linux-iio@vger.kernel.org
14+
Description:
15+
Sets channel Y REFin frequency in Hz. In some clock chained
16+
applications, the reference frequency used by the PLL may
17+
change during runtime. This attribute allows the user to
18+
adjust the reference frequency accordingly.
19+
The value written has no effect until out_altvoltageY_frequency
20+
is updated. Consider to use out_altvoltageY_powerdown to power
21+
down the PLL and it's RFOut buffers during REFin changes.

0 commit comments

Comments
 (0)