Skip to content

Commit 78eef5d

Browse files
Ivan Zaentsevgregkh
authored andcommitted
docs: w1: w1_therm: Fix broken xref, mistakes, clarify text
sysfs attribute names are mixed with the same normal text terms. Use ReST to distinguish. Fix typos and mistakes. Reported-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Ivan Zaentsev <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 51fbad3 commit 78eef5d

File tree

2 files changed

+43
-46
lines changed

2 files changed

+43
-46
lines changed

Documentation/ABI/testing/sysfs-driver-w1_therm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Date: July 2020
146146
Contact: Ivan Zaentsev <[email protected]>
147147
Description:
148148
(RW) Control optional driver settings.
149-
Bit masks to read/write (logical OR):
149+
Bit masks to read/write (bitwise OR):
150150

151151
1: Enable check for conversion success. If byte 6 of
152152
scratchpad memory is 0xC after conversion, and
@@ -157,7 +157,7 @@ Description:
157157
after the conversion start and wait for 1's. In parasite
158158
power mode this feature is not available.
159159

160-
*read*: Currently selected features, bitwise OR.
161-
*write*: Select features, bitwise OR.
160+
*read*: Currently selected features.
161+
*write*: Select features.
162162

163163
Users: An application using the w1_term device

Documentation/w1/slaves/w1_therm.rst

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -27,75 +27,72 @@ W1_THERM_DS1825 0x3B
2727
W1_THERM_DS28EA00 0x42
2828
==================== ====
2929

30-
Support is provided through the sysfs w1_slave file. Each open and
31-
read sequence will initiate a temperature conversion then provide two
30+
Support is provided through the sysfs entry ``w1_slave``. Each open and
31+
read sequence will initiate a temperature conversion, then provide two
3232
lines of ASCII output. The first line contains the nine hex bytes
3333
read along with a calculated crc value and YES or NO if it matched.
3434
If the crc matched the returned values are retained. The second line
3535
displays the retained values along with a temperature in millidegrees
3636
Centigrade after t=.
3737

38-
Alternatively, temperature can be read using temperature sysfs, it
39-
return only temperature in millidegrees Centigrade.
38+
Alternatively, temperature can be read using ``temperature`` sysfs, it
39+
returns only the temperature in millidegrees Centigrade.
4040

41-
A bulk read of all devices on the bus could be done writing 'trigger'
42-
in the therm_bulk_read sysfs entry at w1_bus_master level. This will
43-
sent the convert command on all devices on the bus, and if parasite
44-
powered devices are detected on the bus (and strong pullup is enable
41+
A bulk read of all devices on the bus could be done writing ``trigger``
42+
to ``therm_bulk_read`` entry at w1_bus_master level. This will
43+
send the convert command to all devices on the bus, and if parasite
44+
powered devices are detected on the bus (and strong pullup is enabled
4545
in the module), it will drive the line high during the longer conversion
4646
time required by parasited powered device on the line. Reading
47-
therm_bulk_read will return 0 if no bulk conversion pending,
47+
``therm_bulk_read`` will return 0 if no bulk conversion pending,
4848
-1 if at least one sensor still in conversion, 1 if conversion is complete
4949
but at least one sensor value has not been read yet. Result temperature is
50-
then accessed by reading the temperature sysfs entry of each device, which
50+
then accessed by reading the ``temperature`` entry of each device, which
5151
may return empty if conversion is still in progress. Note that if a bulk
5252
read is sent but one sensor is not read immediately, the next access to
53-
temperature on this device will return the temperature measured at the
53+
``temperature`` on this device will return the temperature measured at the
5454
time of issue of the bulk read command (not the current temperature).
5555

5656
A strong pullup will be applied during the conversion if required.
5757

58-
``conv_time`` sysfs entry is used to get current conversion time (read), and
58+
``conv_time`` is used to get current conversion time (read), and
5959
adjust it (write). A temperature conversion time depends on the device type and
6060
it's current resolution. Default conversion time is set by the driver according
6161
to the device datasheet. A conversion time for many original device clones
6262
deviate from datasheet specs. There are three options: 1) manually set the
6363
correct conversion time by writing a value in milliseconds to ``conv_time``; 2)
6464
auto measure and set a conversion time by writing ``1`` to
65-
``conv_time``; 3) use ``features`` entry to enable poll for conversion
65+
``conv_time``; 3) use ``features`` to enable poll for conversion
6666
completion. Options 2, 3 can't be used in parasite power mode. To get back to
6767
the default conversion time write ``0`` to ``conv_time``.
6868

69-
Writing a value between 9 and 12 to the sysfs w1_slave file will change the
70-
precision of the sensor for the next readings. This value is in (volatile)
71-
SRAM, so it is reset when the sensor gets power-cycled.
69+
Writing a resolution value (in bits) to ``w1_slave`` will change the
70+
precision of the sensor for the next readings. Allowed resolutions are defined by
71+
the sensor. Resolution is reset when the sensor gets power-cycled.
7272

73-
To store the current precision configuration into EEPROM, the value 0
74-
has to be written to the sysfs w1_slave file. Since the EEPROM has a limited
75-
amount of writes (>50k), this command should be used wisely.
73+
To store the current resolution in EEPROM, write ``0`` to ``w1_slave``.
74+
Since the EEPROM has a limited amount of writes (>50k), this command should be
75+
used wisely.
7676

77-
Alternatively, resolution can be set or read (value from 9 to 12) using the
78-
dedicated resolution sysfs entry on each device. This sysfs entry is not present
79-
for devices not supporting this feature.
77+
Alternatively, resolution can be read or written using the dedicated
78+
``resolution`` entry on each device, if supported by the sensor.
8079

81-
Some non-genuine DS18B20 chips are
82-
fixed in 12-bit mode only, so the actual resolution is read back from the chip
83-
and verified by the driver.
80+
Some non-genuine DS18B20 chips are fixed in 12-bit mode only, so the actual
81+
resolution is read back from the chip and verified.
8482

8583
Note: Changing the resolution reverts the conversion time to default.
8684

87-
The write-only sysfs entry eeprom is an alternative for EEPROM operations:
88-
* 'save': will save device RAM to EEPROM
89-
* 'restore': will restore EEPROM data in device RAM.
85+
The write-only sysfs entry ``eeprom`` is an alternative for EEPROM operations.
86+
Write ``save`` to save device RAM to EEPROM. Write ``restore`` to restore EEPROM
87+
data in device RAM.
9088

91-
ext_power syfs entry allow tho check the power status of each device.
92-
* '0': device parasite powered
93-
* '1': device externally powered
89+
``ext_power`` entry allows checking the power state of each device. Reads
90+
``0`` if the device is parasite powered, ``1`` if the device is externally powered.
9491

95-
sysfs alarms allow read or write TH and TL (Temperature High an Low) alarms.
92+
Sysfs ``alarms`` allow read or write TH and TL (Temperature High an Low) alarms.
9693
Values shall be space separated and in the device range (typical -55 degC
9794
to 125 degC). Values are integer as they are store in a 8bit register in
98-
the device. Lowest value is automatically put to TL.Once set, alarms could
95+
the device. Lowest value is automatically put to TL. Once set, alarms could
9996
be search at master level.
10097

10198
The module parameter strong_pullup can be set to 0 to disable the
@@ -119,24 +116,24 @@ The DS28EA00 provides an additional two pins for implementing a sequence
119116
detection algorithm. This feature allows you to determine the physical
120117
location of the chip in the 1-wire bus without needing pre-existing
121118
knowledge of the bus ordering. Support is provided through the sysfs
122-
w1_seq file. The file will contain a single line with an integer value
119+
``w1_seq``. The file will contain a single line with an integer value
123120
representing the device index in the bus starting at 0.
124121

125122
``features`` sysfs entry controls optional driver settings per device.
126-
Insufficient power in parasite mode, line noise and insufficient conversion time
127-
may lead to conversion failure. Original DS18B20 and some clones allow for
123+
Insufficient power in parasite mode, line noise and insufficient conversion
124+
time may lead to conversion failure. Original DS18B20 and some clones allow for
128125
detection of invalid conversion. Write bit mask ``1`` to ``features`` to enable
129126
checking the conversion success. If byte 6 of scratchpad memory is 0xC after
130127
conversion and temperature reads 85.00 (powerup value) or 127.94 (insufficient
131128
power), the driver returns a conversion error. Bit mask ``2`` enables poll for
132129
conversion completion (normal power only) by generating read cycles on the bus
133130
after conversion starts. In parasite power mode this feature is not available.
134-
Feature bit masks may be combined (OR). See accompanying sysfs documentation:
135-
:ref:`Documentation/w1/slaves/w1_therm.rst <w1_therm>`
131+
Feature bit masks may be combined (OR). More details in
132+
Documentation/ABI/testing/sysfs-driver-w1_therm
136133

137134
GX20MH01 device shares family number 0x28 with DS18*20. The device is generally
138-
compatible with DS18B20. Added are lowest 2^-5, 2^-6 temperature bits in Config
139-
register; R2 bit in Config register enabling 13 and 14 bit resolutions. The
140-
device is powered up in 14-bit resolution mode. The conversion times specified
141-
in the datasheet are too low and have to be increased. The device supports
142-
driver features ``1`` and ``2``.
135+
compatible with DS18B20. Added are lowest 2\ :sup:`-5`, 2\ :sup:`-6` temperature
136+
bits in Config register; R2 bit in Config register enabling 13 and 14 bit
137+
resolutions. The device is powered up in 14-bit resolution mode. The conversion
138+
times specified in the datasheet are too low and have to be increased. The
139+
device supports driver features ``1`` and ``2``.

0 commit comments

Comments
 (0)