diff options
author | David Fries <david@fries.net> | 2008-10-16 01:04:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:50 -0400 |
commit | eba3b06da4bd8b79fe6c8ed922a319362c1a40c0 (patch) | |
tree | f6463a23555b02150839c840292b99838fb936a3 | |
parent | 9141f57c7edd40a48a41b7e31427c4b2831a36af (diff) |
W1: Document add, remove, search_count, and pullup.
Document w1_master_add, w1_master_remove, search_count, and pullup.
Signed-off-by: David Fries <david@fries.net>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | Documentation/w1/w1.generic | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/w1/w1.generic b/Documentation/w1/w1.generic index 4c6509dd4789..e3333eec4320 100644 --- a/Documentation/w1/w1.generic +++ b/Documentation/w1/w1.generic | |||
@@ -79,10 +79,13 @@ w1 master sysfs interface | |||
79 | <xx-xxxxxxxxxxxxx> - a directory for a found device. The format is family-serial | 79 | <xx-xxxxxxxxxxxxx> - a directory for a found device. The format is family-serial |
80 | bus - (standard) symlink to the w1 bus | 80 | bus - (standard) symlink to the w1 bus |
81 | driver - (standard) symlink to the w1 driver | 81 | driver - (standard) symlink to the w1 driver |
82 | w1_master_add - Manually register a slave device | ||
82 | w1_master_attempts - the number of times a search was attempted | 83 | w1_master_attempts - the number of times a search was attempted |
83 | w1_master_max_slave_count | 84 | w1_master_max_slave_count |
84 | - the maximum slaves that may be attached to a master | 85 | - the maximum slaves that may be attached to a master |
85 | w1_master_name - the name of the device (w1_bus_masterX) | 86 | w1_master_name - the name of the device (w1_bus_masterX) |
87 | w1_master_pullup - 5V strong pullup 0 enabled, 1 disabled | ||
88 | w1_master_remove - Manually remove a slave device | ||
86 | w1_master_search - the number of searches left to do, -1=continual (default) | 89 | w1_master_search - the number of searches left to do, -1=continual (default) |
87 | w1_master_slave_count | 90 | w1_master_slave_count |
88 | - the number of slaves found | 91 | - the number of slaves found |
@@ -90,7 +93,13 @@ w1_master_slaves - the names of the slaves, one per line | |||
90 | w1_master_timeout - the delay in seconds between searches | 93 | w1_master_timeout - the delay in seconds between searches |
91 | 94 | ||
92 | If you have a w1 bus that never changes (you don't add or remove devices), | 95 | If you have a w1 bus that never changes (you don't add or remove devices), |
93 | you can set w1_master_search to a positive value to disable searches. | 96 | you can set the module parameter search_count to a small positive number |
97 | for an initially small number of bus searches. Alternatively it could be | ||
98 | set to zero, then manually add the slave device serial numbers by | ||
99 | w1_master_add device file. The w1_master_add and w1_master_remove files | ||
100 | generally only make sense when searching is disabled, as a search will | ||
101 | redetect manually removed devices that are present and timeout manually | ||
102 | added devices that aren't on the bus. | ||
94 | 103 | ||
95 | 104 | ||
96 | w1 slave sysfs interface | 105 | w1 slave sysfs interface |