From c9588cad1373730f88d410e43d2e096534483a78 Mon Sep 17 00:00:00 2001 From: David Fries Date: Wed, 15 Oct 2008 22:04:47 -0700 Subject: [PATCH] --- yaml --- r: 114923 b: refs/heads/master c: eba3b06da4bd8b79fe6c8ed922a319362c1a40c0 h: refs/heads/master i: 114921: 38a08cd7b9acdc3bef683a1559a2b2fbdb14e64f 114919: aed2c0968d5f2da2e47ef7ac00c8f89365ec047b v: v3 --- [refs] | 2 +- trunk/Documentation/w1/w1.generic | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dff6a12ecf76..7b5050a7b316 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9141f57c7edd40a48a41b7e31427c4b2831a36af +refs/heads/master: eba3b06da4bd8b79fe6c8ed922a319362c1a40c0 diff --git a/trunk/Documentation/w1/w1.generic b/trunk/Documentation/w1/w1.generic index 4c6509dd4789..e3333eec4320 100644 --- a/trunk/Documentation/w1/w1.generic +++ b/trunk/Documentation/w1/w1.generic @@ -79,10 +79,13 @@ w1 master sysfs interface - a directory for a found device. The format is family-serial bus - (standard) symlink to the w1 bus driver - (standard) symlink to the w1 driver +w1_master_add - Manually register a slave device w1_master_attempts - the number of times a search was attempted w1_master_max_slave_count - the maximum slaves that may be attached to a master w1_master_name - the name of the device (w1_bus_masterX) +w1_master_pullup - 5V strong pullup 0 enabled, 1 disabled +w1_master_remove - Manually remove a slave device w1_master_search - the number of searches left to do, -1=continual (default) w1_master_slave_count - the number of slaves found @@ -90,7 +93,13 @@ w1_master_slaves - the names of the slaves, one per line w1_master_timeout - the delay in seconds between searches If you have a w1 bus that never changes (you don't add or remove devices), -you can set w1_master_search to a positive value to disable searches. +you can set the module parameter search_count to a small positive number +for an initially small number of bus searches. Alternatively it could be +set to zero, then manually add the slave device serial numbers by +w1_master_add device file. The w1_master_add and w1_master_remove files +generally only make sense when searching is disabled, as a search will +redetect manually removed devices that are present and timeout manually +added devices that aren't on the bus. w1 slave sysfs interface